From c81f5bfc5c3cb0bac2a89ee846099dcaae1f357b Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 13 Apr 2011 22:29:12 +0100
Subject: Adjust the quanterions used in the rez coalsced object tests to get
 sensible bounding box and offset numbers.

Extend test to check position of objects in the rezzed coalescence.
---
 OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 4d5eedf..ce1e6b8 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -2088,7 +2088,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>
-- 
cgit v1.1


From 3fe22126ca3974b2a10365121ee0141fb54806e6 Mon Sep 17 00:00:00 2001
From: Mic Bowman
Date: Tue, 12 Apr 2011 12:36:36 -0700
Subject: First pass at moving object property requests into a queue similar to
 the entity update queue. The number of property packets can become
 significant when selecting/deselecting large numbers of objects.

This is experimental code.
---
 OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index ce1e6b8..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()
-- 
cgit v1.1