diff options
| author | Melanie | 2010-02-15 00:20:48 +0000 |
|---|---|---|
| committer | Melanie | 2010-02-15 00:20:48 +0000 |
| commit | c033223c63274ebe41075b24d108ca952fbd242c (patch) | |
| tree | 8c969a9643c469feb37133b175be18eb52fdff49 /OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |
| parent | Extraneous debug messages removed (diff) | |
| parent | Plug a small hole (diff) | |
| download | opensim-SC_OLD-c033223c63274ebe41075b24d108ca952fbd242c.zip opensim-SC_OLD-c033223c63274ebe41075b24d108ca952fbd242c.tar.gz opensim-SC_OLD-c033223c63274ebe41075b24d108ca952fbd242c.tar.bz2 opensim-SC_OLD-c033223c63274ebe41075b24d108ca952fbd242c.tar.xz | |
Merge branch 'master' into presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.Inventory.cs')
| -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 e032a07..ded001b 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
| @@ -528,6 +528,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 528 | m_log.Error("[AGENT INVENTORY]: Failed to find item " + oldItemID.ToString()); | 528 | m_log.Error("[AGENT INVENTORY]: Failed to find item " + oldItemID.ToString()); |
| 529 | return; | 529 | return; |
| 530 | } | 530 | } |
| 531 | |||
| 532 | if ((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0) | ||
| 533 | return; | ||
| 531 | } | 534 | } |
| 532 | 535 | ||
| 533 | AssetBase asset = AssetService.Get(item.AssetID.ToString()); | 536 | AssetBase asset = AssetService.Get(item.AssetID.ToString()); |