From 3c321e5bb37d0430085c361632fb668824e9b500 Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Tue, 5 Aug 2014 22:49:41 +0100 Subject: [PATCH] dont mess with names and descriptions on coalescence objects. Inventory name can change for inventory purposes only. --- .../Framework/InventoryAccess/InventoryAccessModule.cs | 5 ++++- OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | 4 +++- 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 e4f23f9655..e8e281eb13 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 // object itself before we rez. // // Only do these for the first object if we are rezzing a coalescence. - if (i == 0) + // nahh dont mess with coalescence objects, + // the name in inventory can be change for inventory purpuses only + if (i == 0 && objlist.Count == 1) { rootPart.Name = item.Name; rootPart.Description = item.Description; + // this should be done only on first or all ??? if ((item.Flags & (uint)InventoryItemFlags.ObjectSlamSale) != 0) { rootPart.ObjectSaleType = item.SaleType; diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs index 400a415cb9..657d7c1215 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs @@ -917,7 +917,9 @@ namespace OpenSim.Region.Framework.Scenes // in the serialization, transfer the correct name from the inventory to the // object itself before we rez. // Only do these for the first object if we are rezzing a coalescence. - if (i == 0) + // nahh dont mess with coalescence objects, + // the name in inventory can be change for inventory purpuses only + if (i == 0 && objlist.Count == 1) { rootPart.Name = item.Name; rootPart.Description = item.Description;