aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs5
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs4
2 files changed, 7 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index e4f23f9..e8e281e 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -1032,10 +1032,13 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
1032 // object itself before we rez. 1032 // object itself before we rez.
1033 // 1033 //
1034 // Only do these for the first object if we are rezzing a coalescence. 1034 // Only do these for the first object if we are rezzing a coalescence.
1035 if (i == 0) 1035 // nahh dont mess with coalescence objects,
1036 // the name in inventory can be change for inventory purpuses only
1037 if (i == 0 && objlist.Count == 1)
1036 { 1038 {
1037 rootPart.Name = item.Name; 1039 rootPart.Name = item.Name;
1038 rootPart.Description = item.Description; 1040 rootPart.Description = item.Description;
1041 // this should be done only on first or all ???
1039 if ((item.Flags & (uint)InventoryItemFlags.ObjectSlamSale) != 0) 1042 if ((item.Flags & (uint)InventoryItemFlags.ObjectSlamSale) != 0)
1040 { 1043 {
1041 rootPart.ObjectSaleType = item.SaleType; 1044 rootPart.ObjectSaleType = item.SaleType;
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index 400a415..657d7c1 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -917,7 +917,9 @@ namespace OpenSim.Region.Framework.Scenes
917 // in the serialization, transfer the correct name from the inventory to the 917 // in the serialization, transfer the correct name from the inventory to the
918 // object itself before we rez. 918 // object itself before we rez.
919 // Only do these for the first object if we are rezzing a coalescence. 919 // Only do these for the first object if we are rezzing a coalescence.
920 if (i == 0) 920 // nahh dont mess with coalescence objects,
921 // the name in inventory can be change for inventory purpuses only
922 if (i == 0 && objlist.Count == 1)
921 { 923 {
922 rootPart.Name = item.Name; 924 rootPart.Name = item.Name;
923 rootPart.Description = item.Description; 925 rootPart.Description = item.Description;