diff options
| author | BlueWall | 2012-12-12 16:15:32 -0500 |
|---|---|---|
| committer | BlueWall | 2012-12-12 16:15:32 -0500 |
| commit | c5d333c16cddbcbcceb1ed0bc937e5775c99c2bc (patch) | |
| tree | 644d21cbd5b7e86d9ba3316979fd9a85bc028f51 /OpenSim/Region/Framework | |
| parent | Replace Mono.Addins libraries (diff) | |
| parent | BulletSim: do not return the current velocity for targetVelocity. (diff) | |
| download | opensim-SC_OLD-c5d333c16cddbcbcceb1ed0bc937e5775c99c2bc.zip opensim-SC_OLD-c5d333c16cddbcbcceb1ed0bc937e5775c99c2bc.tar.gz opensim-SC_OLD-c5d333c16cddbcbcceb1ed0bc937e5775c99c2bc.tar.bz2 opensim-SC_OLD-c5d333c16cddbcbcceb1ed0bc937e5775c99c2bc.tar.xz | |
Merge branch 'master' of /home/opensim/var/repo/opensim
Diffstat (limited to 'OpenSim/Region/Framework')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index e0f3c99..5c8b097 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
| @@ -688,12 +688,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 688 | itemCopy.SalePrice = item.SalePrice; | 688 | itemCopy.SalePrice = item.SalePrice; |
| 689 | itemCopy.SaleType = item.SaleType; | 689 | itemCopy.SaleType = item.SaleType; |
| 690 | 690 | ||
| 691 | if (AddInventoryItem(itemCopy)) | 691 | IInventoryAccessModule invAccess = RequestModuleInterface<IInventoryAccessModule>(); |
| 692 | { | 692 | if (invAccess != null) |
| 693 | IInventoryAccessModule invAccess = RequestModuleInterface<IInventoryAccessModule>(); | 693 | invAccess.TransferInventoryAssets(itemCopy, senderId, recipient); |
| 694 | if (invAccess != null) | 694 | AddInventoryItem(itemCopy); |
| 695 | invAccess.TransferInventoryAssets(itemCopy, senderId, recipient); | ||
| 696 | } | ||
| 697 | 695 | ||
| 698 | if (!Permissions.BypassPermissions()) | 696 | if (!Permissions.BypassPermissions()) |
| 699 | { | 697 | { |