From 13129f1a8d25ccefee9d18ae8c71ad37323695fd Mon Sep 17 00:00:00 2001
From: Melanie
Date: Fri, 29 Oct 2010 18:59:53 +0200
Subject: Preliminary work on appearance layers. No user functionality yet.

---
 .../Framework/InventoryAccess/InventoryAccessModule.cs       | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Region/CoreModules')

diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index d429979..0700aa5 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -762,10 +762,14 @@ 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;
+                        // On coalesced objects, this has no effect.
+                        if ((item.Flags & (uint)InventoryItemFlags.ObjectHasMultipleItems) == 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) ||
-- 
cgit v1.1