Merge git://opensimulator.org/git/opensim

1 files changed, 9 insertions, 10 deletions

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 4d5eedf..8a8a699 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -2055,15 +2055,7 @@ namespace OpenSim.Region.Framework.Scenes
 
         public void GetProperties(IClientAPI client)
         {
-            //Viewer wants date in microseconds so multiply it by 1,000,000.
-            client.SendObjectPropertiesReply(
-                m_fromUserInventoryItemID, (ulong)_creationDate*(ulong)1e6, _creatorID, UUID.Zero, UUID.Zero,
-                _groupID, (short)InventorySerial, _lastOwnerID, UUID, _ownerID,
-                ParentGroup.RootPart.TouchName, new byte[0], ParentGroup.RootPart.SitName, Name, Description,
-                ParentGroup.RootPart._ownerMask, ParentGroup.RootPart._nextOwnerMask, ParentGroup.RootPart._groupMask, ParentGroup.RootPart._everyoneMask,
-                ParentGroup.RootPart._baseMask,
-                ParentGroup.RootPart.ObjectSaleType,
-                ParentGroup.RootPart.SalePrice);
+            client.SendObjectPropertiesReply(this);
         }
 
         public UUID GetRootPartUUID()
@@ -2088,7 +2080,14 @@ namespace OpenSim.Region.Framework.Scenes
 
             axPos *= parentRot;
             Vector3 translationOffsetPosition = axPos;
-            return GroupPosition + translationOffsetPosition;
+            
+//            m_log.DebugFormat("[SCENE OBJECT PART]: Found group pos {0} for part {1}", GroupPosition, Name);
+            
+            Vector3 worldPos = GroupPosition + translationOffsetPosition;
+                
+//            m_log.DebugFormat("[SCENE OBJECT PART]: Found world pos {0} for part {1}", worldPos, Name);
+            
+            return worldPos;
         }
 
         /// <summary>