From d8d28c37372718aa593ead5c85cd45ced83766a5 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 13 Apr 2011 21:31:45 +0100
Subject: Fix bug where rezzing coalesced objects would give all objects the
 same name as the item.

This now only happens for the first object (which was the item selected last when the coalesce was originally taken)
This matches the expected behaviour of the environment as seen on the Linden Labs grid.
---
 .../Framework/InventoryAccess/InventoryAccessModule.cs      | 13 +++++++++----
 .../InventoryAccess/Tests/InventoryAccessModuleTests.cs     |  5 ++---
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index cfcfc79..1f8bad1 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -762,10 +762,15 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                         // affect the name stored in the serialization, transfer
                         // the correct name from the inventory to the
                         // object itself before we rez.
-                        rootPart.Name = item.Name;
-                        rootPart.Description = item.Description;
-                        rootPart.ObjectSaleType = item.SaleType;
-                        rootPart.SalePrice = item.SalePrice;
+                        //
+                        // Only do these for the first object if we are rezzing a coalescence.
+                        if (i == 0)
+                        {
+                            rootPart.Name = item.Name;
+                            rootPart.Description = item.Description;
+                            rootPart.ObjectSaleType = item.SaleType;
+                            rootPart.SalePrice = item.SalePrice;
+                        }
 
                         group.SetGroup(remoteClient.ActiveGroupId, remoteClient);
                         if ((rootPart.OwnerID != item.Owner) ||
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/InventoryAccessModuleTests.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/InventoryAccessModuleTests.cs
index f8fa424..0f2b610 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/InventoryAccessModuleTests.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/Tests/InventoryAccessModuleTests.cs
@@ -154,9 +154,8 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess.Tests
             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);            
+            SceneObjectPart retrievedObj2Part = m_scene.GetSceneObjectPart(object2.Name);
+            Assert.That(retrievedObj2Part, Is.Not.Null);            
         }        
         
         [Test]
-- 
cgit v1.1