From e1a5a1f829ad7b82fa8dc5b81248dff45b586f40 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Tue, 5 Aug 2014 23:25:08 +0100
Subject: apply objectSlamSale to all roots of coalescence objects. replace
the single object condition for renaming
---
.../Framework/InventoryAccess/InventoryAccessModule.cs | 14 +++++++-------
.../Region/Framework/Scenes/SceneObjectPartInventory.cs | 2 +-
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index e8e281e..7b13e0b 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -1034,16 +1034,16 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
// Only do these for the first object if we are rezzing a coalescence.
// nahh dont mess with coalescence objects,
// the name in inventory can be change for inventory purpuses only
- if (i == 0 && objlist.Count == 1)
+ if (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;
- rootPart.SalePrice = item.SalePrice;
- }
+ }
+
+ if ((item.Flags & (uint)InventoryItemFlags.ObjectSlamSale) != 0)
+ {
+ rootPart.ObjectSaleType = item.SaleType;
+ rootPart.SalePrice = item.SalePrice;
}
so.FromFolderID = item.Folder;
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index 657d7c1..a6a963b 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -919,7 +919,7 @@ namespace OpenSim.Region.Framework.Scenes
// Only do these for the first object if we are rezzing a coalescence.
// nahh dont mess with coalescence objects,
// the name in inventory can be change for inventory purpuses only
- if (i == 0 && objlist.Count == 1)
+ if (objlist.Count == 1)
{
rootPart.Name = item.Name;
rootPart.Description = item.Description;
--
cgit v1.1