diff options
| author | CasperW | 2010-02-15 06:15:14 +0100 |
|---|---|---|
| committer | CasperW | 2010-02-15 06:15:14 +0100 |
| commit | 47a9e48f46ea200867e3b85fb3351ebadc90c4aa (patch) | |
| tree | 9a803ab21042c07075cbc11d858fe49732e65556 /OpenSim/Region/Framework/Scenes | |
| parent | Implement missing llGetPrimitiveParams parameters (diff) | |
| parent | Plug a small hole (diff) | |
| download | opensim-SC-47a9e48f46ea200867e3b85fb3351ebadc90c4aa.zip opensim-SC-47a9e48f46ea200867e3b85fb3351ebadc90c4aa.tar.gz opensim-SC-47a9e48f46ea200867e3b85fb3351ebadc90c4aa.tar.bz2 opensim-SC-47a9e48f46ea200867e3b85fb3351ebadc90c4aa.tar.xz | |
Merge branch 'master' of ssh://TOR/var/git/careminster
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index 7b852a2..b2b061e 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
| @@ -585,6 +585,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 585 | m_log.Error("[AGENT INVENTORY]: Failed to find item " + oldItemID.ToString()); | 585 | m_log.Error("[AGENT INVENTORY]: Failed to find item " + oldItemID.ToString()); |
| 586 | return; | 586 | return; |
| 587 | } | 587 | } |
| 588 | |||
| 589 | if ((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0) | ||
| 590 | return; | ||
| 588 | } | 591 | } |
| 589 | 592 | ||
| 590 | AssetBase asset = AssetService.Get(item.AssetID.ToString()); | 593 | AssetBase asset = AssetService.Get(item.AssetID.ToString()); |