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 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'OpenSim/Region/CoreModules/Framework')

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;
-- 
cgit v1.1