1 files changed, 79 insertions, 0 deletions

diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/InventoryAccessModuleTests.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/InventoryAccessModuleTests.cs
index 5eca753..f8fa424 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/InventoryAccessModuleTests.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/InventoryAccessModuleTests.cs
@@ -81,6 +81,85 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess.Tests
         }
         
         [Test]
+        public void TestRezCoalescedObject()
+        {
+            TestHelper.InMethod();
+            log4net.Config.XmlConfigurator.Configure();
+            
+            // Create asset
+            SceneObjectGroup object1;
+            {
+                string partName = "Object1";
+                UUID ownerId = UUID.Parse("00000000-0000-0000-0000-000000000040");
+                PrimitiveBaseShape shape = PrimitiveBaseShape.CreateSphere();
+                Vector3 groupPosition = new Vector3(10, 20, 30);
+                Quaternion rotationOffset = new Quaternion(20, 30, 40, 50);
+                Vector3 offsetPosition = new Vector3(5, 10, 15);
+
+                SceneObjectPart part1
+                    = new SceneObjectPart(
+                        ownerId, shape, groupPosition, rotationOffset, offsetPosition);
+                part1.Name = partName;
+
+                object1 = new SceneObjectGroup(part1);
+            }
+            
+            SceneObjectGroup object2;
+            {
+                string partName = "Object2";
+                UUID ownerId = UUID.Parse("00000000-0000-0000-0000-000000000040");
+                PrimitiveBaseShape shape = PrimitiveBaseShape.CreateSphere();
+                Vector3 groupPosition = new Vector3(10, 20, 30);
+                Quaternion rotationOffset = new Quaternion(20, 30, 40, 50);
+                Vector3 offsetPosition = new Vector3(5, 10, 15);
+
+                SceneObjectPart part1
+                    = new SceneObjectPart(
+                        ownerId, shape, groupPosition, rotationOffset, offsetPosition);
+                part1.Name = partName;
+
+                object2 = new SceneObjectGroup(part1);
+            }            
+            
+            CoalescedSceneObjects coa = new CoalescedSceneObjects(m_userId, object1, object2);
+
+            UUID asset1Id = UUID.Parse("00000000-0000-0000-0000-000000000060");
+            AssetBase asset1 = AssetHelpers.CreateAsset(asset1Id, coa);
+            m_scene.AssetService.Store(asset1);
+
+            // Create item
+            UUID item1Id = UUID.Parse("00000000-0000-0000-0000-000000000080");
+            string item1Name = "My Little Dog";
+            InventoryItemBase item1 = new InventoryItemBase();
+            item1.Name = item1Name;
+            item1.AssetID = asset1.FullID;
+            item1.ID = item1Id;
+            InventoryFolderBase objsFolder 
+                = InventoryArchiveUtils.FindFolderByPath(m_scene.InventoryService, m_userId, "Objects")[0];
+            item1.Folder = objsFolder.ID;
+            m_scene.AddInventoryItem(item1);
+            
+            SceneObjectGroup so 
+                = m_iam.RezObject(
+                    m_tc, item1Id, Vector3.Zero, Vector3.Zero, UUID.Zero, 1, false, false, false, UUID.Zero, false);            
+            
+            Assert.That(so, Is.Not.Null);
+            
+            Assert.That(m_scene.SceneGraph.GetTotalObjectsCount(), Is.EqualTo(2));
+          
+            SceneObjectPart retrievedObj1Part = m_scene.GetSceneObjectPart(object1.Name);
+            Assert.That(retrievedObj1Part, Is.Null);
+            
+            retrievedObj1Part = m_scene.GetSceneObjectPart(item1.Name);
+            Assert.That(retrievedObj1Part, Is.Not.Null);
+            Assert.That(retrievedObj1Part.Name, Is.EqualTo(item1.Name));
+            
+            // FIXME: Can't test yet due to a bug where objects in coalescence all get the item name when rerezzed.
+//            SceneObjectPart retrievedObj2Part = m_scene.GetSceneObjectPart(object2.Name);
+//            Assert.That(retrievedObj2Part, Is.Not.Null);            
+        }        
+        
+        [Test]
         public void TestRezObject()
         {
             TestHelper.InMethod();