Merge branch 'master' of ssh://3dhosting.de/var/git/careminster

Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs

1 files changed, 17 insertions, 2 deletions

diff --git a/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs b/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs
index e434b2e..e77f0aa 100644
--- a/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs
+++ b/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs
@@ -546,7 +546,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
         {
             ConsoleDisplayList cdl = new ConsoleDisplayList();
             cdl.AddRow("Name", so.Name);
-            cdl.AddRow("Descrition", so.Description);
+            cdl.AddRow("Description", so.Description);
             cdl.AddRow("Local ID", so.LocalId);
             cdl.AddRow("UUID", so.UUID);
             cdl.AddRow("Location", string.Format("{0} @ {1}", so.AbsolutePosition, so.Scene.Name));
@@ -631,7 +631,22 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
                 cdl.AddRow("SculptType", s.SculptType);
                 cdl.AddRow("State", s.State);
 
-                // TODO, unpack and display texture entries
+                // TODO, need to display more information about textures but in a compact format
+                // to stop output becoming huge.
+                for (int i = 0; i < sop.GetNumberOfSides(); i++)               
+                {
+                    Primitive.TextureEntryFace teFace = s.Textures.FaceTextures[i];
+
+                    UUID textureID;
+
+                    if (teFace != null)
+                        textureID = teFace.TextureID;
+                    else
+                        textureID = s.Textures.DefaultTexture.TextureID;
+
+                    cdl.AddRow(string.Format("Face {0} texture ID", i), textureID);
+                }
+
                 //cdl.AddRow("Textures", string.Format("{0} entries", s.Textures.
             }