From 58efd761d13bd4f2617fcb3f94bbe265880589e3 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 13 Apr 2011 21:17:43 +0100
Subject: Add coalesced scene objects class and serializer.  This is currently
 only used by the TestRezCoalescedObject() regression test.

This structure matches the existing one for SceneObjects and will allow code to be reused by the uuid gatherer, other tests, etc.
Test is not yet fully implemented due to a bug in rezzing coalesced objects where they all get the same name as the item.
Only one object should get the same name as the item, which appears to be the one selected last when the the objects were coalesced in the first place.
This bug will be addressed shortly.
---
 OpenSim/Tests/Common/Setup/AssetHelpers.cs | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'OpenSim/Tests/Common')

diff --git a/OpenSim/Tests/Common/Setup/AssetHelpers.cs b/OpenSim/Tests/Common/Setup/AssetHelpers.cs
index ff4423f..af66d7f 100644
--- a/OpenSim/Tests/Common/Setup/AssetHelpers.cs
+++ b/OpenSim/Tests/Common/Setup/AssetHelpers.cs
@@ -71,6 +71,21 @@ namespace OpenSim.Tests.Common
                 Encoding.ASCII.GetBytes(SceneObjectSerializer.ToOriginalXmlFormat(sog)), 
                 sog.OwnerID);
         }
+        
+        /// <summary>
+        /// Create an asset from the given scene object.
+        /// </summary>
+        /// <param name="assetUuid"></param>
+        /// <param name="coa"></param>
+        /// <returns></returns>
+        public static AssetBase CreateAsset(UUID assetUuid, CoalescedSceneObjects coa)
+        {
+            return CreateAsset(
+                assetUuid, 
+                AssetType.Object, 
+                Encoding.ASCII.GetBytes(CoalescedSceneObjectsSerializer.ToXml(coa)), 
+                coa.CreatorId);
+        }        
             
         /// <summary>
         /// Create an asset from the given data.
-- 
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/Tests/Common/Mock/TestClient.cs | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

(limited to 'OpenSim/Tests/Common')

diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs
index d1dc17f..dca5626 100644
--- a/OpenSim/Tests/Common/Mock/TestClient.cs
+++ b/OpenSim/Tests/Common/Mock/TestClient.cs
@@ -816,18 +816,11 @@ namespace OpenSim.Tests.Common.Mock
         {
         }
 
-        public void SendObjectPropertiesFamilyData(uint RequestFlags, UUID ObjectUUID, UUID OwnerID, UUID GroupID,
-                                                    uint BaseMask, uint OwnerMask, uint GroupMask, uint EveryoneMask,
-                                                    uint NextOwnerMask, int OwnershipCost, byte SaleType,int SalePrice, uint Category,
-                                                    UUID LastOwnerID, string ObjectName, string Description)
+        public void SendObjectPropertiesFamilyData(ISceneEntity Entity, uint RequestFlags)
         {
         }
 
-        public void SendObjectPropertiesReply(UUID ItemID, ulong CreationDate, UUID CreatorUUID, UUID FolderUUID, UUID FromTaskUUID,
-                                              UUID GroupUUID, short InventorySerial, UUID LastOwnerUUID, UUID ObjectUUID,
-                                              UUID OwnerUUID, string TouchTitle, byte[] TextureID, string SitTitle, string ItemName,
-                                              string ItemDescription, uint OwnerMask, uint NextOwnerMask, uint GroupMask, uint EveryoneMask,
-                                              uint BaseMask, byte saleType, int salePrice)
+        public void SendObjectPropertiesReply(ISceneEntity entity)
         {
         }
 
-- 
cgit v1.1