diff options
author | UbitUmarov | 2014-08-05 22:49:41 +0100 |
---|---|---|
committer | UbitUmarov | 2014-08-05 22:49:41 +0100 |
commit | 3c321e5bb37d0430085c361632fb668824e9b500 (patch) | |
tree | 2cb4632bc2a36909ab99cec1146381d1d8fb226f /OpenSim/Region/CoreModules | |
parent | revert to old avn-current code, not using ApplyPermissionsOnRez() till its (diff) | |
download | opensim-SC-3c321e5bb37d0430085c361632fb668824e9b500.zip opensim-SC-3c321e5bb37d0430085c361632fb668824e9b500.tar.gz opensim-SC-3c321e5bb37d0430085c361632fb668824e9b500.tar.bz2 opensim-SC-3c321e5bb37d0430085c361632fb668824e9b500.tar.xz |
dont mess with names and descriptions on coalescence objects. Inventory
name can change for inventory purposes only.
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | 5 |
1 files changed, 4 insertions, 1 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; |