diff options
author | Justin Clark-Casey (justincc) | 2011-04-13 21:31:45 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-04-13 21:31:45 +0100 |
commit | d8d28c37372718aa593ead5c85cd45ced83766a5 (patch) | |
tree | 15203169c5da41cd91692152563743aeb7d152bc /OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | |
parent | Add coalesced scene objects class and serializer. This is currently only use... (diff) | |
download | opensim-SC_OLD-d8d28c37372718aa593ead5c85cd45ced83766a5.zip opensim-SC_OLD-d8d28c37372718aa593ead5c85cd45ced83766a5.tar.gz opensim-SC_OLD-d8d28c37372718aa593ead5c85cd45ced83766a5.tar.bz2 opensim-SC_OLD-d8d28c37372718aa593ead5c85cd45ced83766a5.tar.xz |
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.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | 13 |
1 files changed, 9 insertions, 4 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 | |||
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 | // |
766 | rootPart.Description = item.Description; | 766 | // Only do these for the first object if we are rezzing a coalescence. |
767 | rootPart.ObjectSaleType = item.SaleType; | 767 | if (i == 0) |
768 | rootPart.SalePrice = item.SalePrice; | 768 | { |
769 | rootPart.Name = item.Name; | ||
770 | rootPart.Description = item.Description; | ||
771 | rootPart.ObjectSaleType = item.SaleType; | ||
772 | rootPart.SalePrice = item.SalePrice; | ||
773 | } | ||
769 | 774 | ||
770 | group.SetGroup(remoteClient.ActiveGroupId, remoteClient); | 775 | group.SetGroup(remoteClient.ActiveGroupId, remoteClient); |
771 | if ((rootPart.OwnerID != item.Owner) || | 776 | if ((rootPart.OwnerID != item.Owner) || |