diff options
author | UbitUmarov | 2014-08-05 23:25:08 +0100 |
---|---|---|
committer | UbitUmarov | 2014-08-05 23:25:08 +0100 |
commit | e1a5a1f829ad7b82fa8dc5b81248dff45b586f40 (patch) | |
tree | f1dfe7a0570368fcbb0e243a4c03b8cb1eff2ca3 /OpenSim/Region/CoreModules/Framework/InventoryAccess | |
parent | dont mess with names and descriptions on coalescence objects. Inventory (diff) | |
download | opensim-SC_OLD-e1a5a1f829ad7b82fa8dc5b81248dff45b586f40.zip opensim-SC_OLD-e1a5a1f829ad7b82fa8dc5b81248dff45b586f40.tar.gz opensim-SC_OLD-e1a5a1f829ad7b82fa8dc5b81248dff45b586f40.tar.bz2 opensim-SC_OLD-e1a5a1f829ad7b82fa8dc5b81248dff45b586f40.tar.xz |
apply objectSlamSale to all roots of coalescence objects. replace the
single object condition for renaming
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/InventoryAccess')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | 14 |
1 files changed, 7 insertions, 7 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 | |||
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 | // nahh dont mess with coalescence objects, | 1035 | // nahh dont mess with coalescence objects, |
1036 | // the name in inventory can be change for inventory purpuses only | 1036 | // the name in inventory can be change for inventory purpuses only |
1037 | if (i == 0 && objlist.Count == 1) | 1037 | if (objlist.Count == 1) |
1038 | { | 1038 | { |
1039 | rootPart.Name = item.Name; | 1039 | rootPart.Name = item.Name; |
1040 | rootPart.Description = item.Description; | 1040 | rootPart.Description = item.Description; |
1041 | // this should be done only on first or all ??? | 1041 | } |
1042 | if ((item.Flags & (uint)InventoryItemFlags.ObjectSlamSale) != 0) | 1042 | |
1043 | { | 1043 | if ((item.Flags & (uint)InventoryItemFlags.ObjectSlamSale) != 0) |
1044 | rootPart.ObjectSaleType = item.SaleType; | 1044 | { |
1045 | rootPart.SalePrice = item.SalePrice; | 1045 | rootPart.ObjectSaleType = item.SaleType; |
1046 | } | 1046 | rootPart.SalePrice = item.SalePrice; |
1047 | } | 1047 | } |
1048 | 1048 | ||
1049 | so.FromFolderID = item.Folder; | 1049 | so.FromFolderID = item.Folder; |