aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework')
-rw-r--r--OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs12
1 files changed, 8 insertions, 4 deletions
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
762 // affect the name stored in the serialization, transfer 762 // affect the name stored in the serialization, transfer
763 // the correct name from the inventory to the 763 // the correct name from the inventory to the
764 // object itself before we rez. 764 // object itself before we rez.
765 rootPart.Name = item.Name; 765 // On coalesced objects, this has no effect.
766 rootPart.Description = item.Description; 766 if ((item.Flags & (uint)InventoryItemFlags.ObjectHasMultipleItems) == 0)
767 rootPart.ObjectSaleType = item.SaleType; 767 {
768 rootPart.SalePrice = item.SalePrice; 768 rootPart.Name = item.Name;
769 rootPart.Description = item.Description;
770 rootPart.ObjectSaleType = item.SaleType;
771 rootPart.SalePrice = item.SalePrice;
772 }
769 773
770 group.SetGroup(remoteClient.ActiveGroupId, remoteClient); 774 group.SetGroup(remoteClient.ActiveGroupId, remoteClient);
771 if ((rootPart.OwnerID != item.Owner) || 775 if ((rootPart.OwnerID != item.Owner) ||