diff options
| author | Justin Clark-Casey (justincc) | 2010-02-16 19:08:06 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-02-16 19:08:06 +0000 |
| commit | 4c90ee29432539efbf5942010dd574822235ed57 (patch) | |
| tree | d159f72df97dfef5719221301009e90f375f2ef2 /OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |
| parent | minor: Make SOG.DelinkFromGroup() return the newly delinked scene object inst... (diff) | |
| parent | Formatting cleanup. (diff) | |
| download | opensim-SC_OLD-4c90ee29432539efbf5942010dd574822235ed57.zip opensim-SC_OLD-4c90ee29432539efbf5942010dd574822235ed57.tar.gz opensim-SC_OLD-4c90ee29432539efbf5942010dd574822235ed57.tar.bz2 opensim-SC_OLD-4c90ee29432539efbf5942010dd574822235ed57.tar.xz | |
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
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 7df3e50..c6cee75 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()); |