Don't display label on top of images.

git-svn-id: https://radegast.googlecode.com/svn/trunk@736 f7a694da-4d33-11de-9ad6-1127a62b9fcd

diff --git a/Radegast/GUI/Consoles/Assets/SLImageHandler.cs b/Radegast/GUI/Consoles/Assets/SLImageHandler.cs
index 56a8a9a..26d1da9 100644 (file)
--- a/Radegast/GUI/Consoles/Assets/SLImageHandler.cs
+++ b/Radegast/GUI/Consoles/Assets/SLImageHandler.cs
@@ -45,7 +45,6 @@ namespace Radegast
         private GridClient client { get { return instance.Client; } }
         private UUID imageID;
 
-        TransparentLabel lblDesc;
         byte[] jpegdata;
         ManagedImage imgManaged;
         Image image;
@@ -101,19 +100,8 @@ namespace Radegast
             this.instance = instance;
             this.imageID = image;
 
-            lblDesc = new TransparentLabel();
-            lblDesc.Top = 5;
-            lblDesc.Left = 5;
-            lblDesc.Text = label;
-            pictureBox1.Controls.Add(lblDesc);
-
             Text = string.IsNullOrEmpty(label) ? "Image" : label;
 
-            if (lblDesc.Text == string.Empty)
-            {
-                lblDesc.Hide();
-            }
-
             // Callbacks
             client.Assets.ImageReceiveProgress += new EventHandler<ImageReceiveProgressEventArgs>(Assets_ImageReceiveProgress);
             progressBar1.Visible = true;
@@ -145,7 +133,7 @@ namespace Radegast
 
             if (InvokeRequired)
             {
-                if (IsHandleCreated)
+                if (IsHandleCreated || !instance.MonoRuntime)
                     BeginInvoke(new MethodInvoker(() => Assets_ImageReceiveProgress(sender, e)));
                 return;
             }
@@ -167,7 +155,7 @@ namespace Radegast
         {
             if (InvokeRequired)
             {
-                if (IsHandleCreated)
+                if (IsHandleCreated || !instance.MonoRuntime)
                     BeginInvoke(new MethodInvoker(() => DisplayPartialImage(assetTexture)));
                 return;
             }
@@ -194,7 +182,7 @@ namespace Radegast
 
             if (InvokeRequired)
             {
-                if (IsHandleCreated)
+                if (IsHandleCreated || !instance.MonoRuntime)
                     BeginInvoke(new MethodInvoker(() => Assets_OnImageReceived(assetTexture)));
                 return;
             }

diff --git a/Radegast/GUI/Consoles/OutfitTextures.cs b/Radegast/GUI/Consoles/OutfitTextures.cs
index 53b942b..e880374 100644 (file)
--- a/Radegast/GUI/Consoles/OutfitTextures.cs
+++ b/Radegast/GUI/Consoles/OutfitTextures.cs
@@ -29,6 +29,7 @@
 // $Id$
 //
 using System.Drawing;
+using System.Collections.Generic;
 using System.Windows.Forms;
 using OpenMetaverse;
 
@@ -53,31 +54,24 @@ namespace Radegast
 
             lblName.Text = this.avatar.Name;
 
-            int nTextures = 0;
-
-            for (int j = 0; j < avatar.Textures.FaceTextures.Length; j++) {
+            for (int j = 0; j < avatar.Textures.FaceTextures.Length; j++)
+            {
                 Primitive.TextureEntryFace face = avatar.Textures.FaceTextures[j];
 
-                if (face != null) {
-                    //ImageType type = ImageType.Normal;
+                if (face != null)
+                {
+                    if (face.TextureID != AppearanceManager.DEFAULT_AVATAR_TEXTURE)
+                    {
+                        SLImageHandler img = new SLImageHandler(instance, face.TextureID, ((AvatarTextureIndex)j).ToString());
 
-                    //switch ((AppearanceManager.TextureIndex)j) {
-                    //    case AppearanceManager.TextureIndex.HeadBaked:
-                    //    case AppearanceManager.TextureIndex.EyesBaked:
-                    //    case AppearanceManager.TextureIndex.UpperBaked:
-                    //    case AppearanceManager.TextureIndex.LowerBaked:
-                    //    case AppearanceManager.TextureIndex.SkirtBaked:
-                    //    case AppearanceManager.TextureIndex.HairBaked:
-                    //        type = ImageType.Baked;
-                    //        break;
-                    //}
+                        GroupBox gbx = new GroupBox();
+                        gbx.Dock = DockStyle.Top;
+                        gbx.Text = img.Text;
+                        gbx.Height = 550;
 
-                    if (face.TextureID != AppearanceManager.DEFAULT_AVATAR_TEXTURE) {
-                        SLImageHandler img = new SLImageHandler(instance, face.TextureID, ((AvatarTextureIndex)j).ToString());
-                        img.Location = new Point(0, nTextures++ * img.Height);
-                        img.Dock = DockStyle.Top;
-                        img.Height = 450;
-                        pnlImages.Controls.Add(img);
+                        img.Dock = DockStyle.Fill;
+                        gbx.Controls.Add(img);
+                        pnlImages.Controls.Add(gbx);
                     }
                 }
             }