diff options
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | 14 | ||||
-rw-r--r-- | OpenSim/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 | |||
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; |
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 | |||
919 | // Only do these for the first object if we are rezzing a coalescence. | 919 | // Only do these for the first object if we are rezzing a coalescence. |
920 | // nahh dont mess with coalescence objects, | 920 | // nahh dont mess with coalescence objects, |
921 | // the name in inventory can be change for inventory purpuses only | 921 | // the name in inventory can be change for inventory purpuses only |
922 | if (i == 0 && objlist.Count == 1) | 922 | if (objlist.Count == 1) |
923 | { | 923 | { |
924 | rootPart.Name = item.Name; | 924 | rootPart.Name = item.Name; |
925 | rootPart.Description = item.Description; | 925 | rootPart.Description = item.Description; |