diff options
| author | Melanie | 2012-05-14 23:33:16 +0100 |
|---|---|---|
| committer | Melanie | 2012-05-14 23:33:16 +0100 |
| commit | 71115c32ad68a546f8bbaf52408cdfadda21b352 (patch) | |
| tree | 481a80299a300b95a6c64c49d76859045ca64892 /OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Completely revamp collision handling. Now works as it is supposed to. (diff) | |
| download | opensim-SC-71115c32ad68a546f8bbaf52408cdfadda21b352.zip opensim-SC-71115c32ad68a546f8bbaf52408cdfadda21b352.tar.gz opensim-SC-71115c32ad68a546f8bbaf52408cdfadda21b352.tar.bz2 opensim-SC-71115c32ad68a546f8bbaf52408cdfadda21b352.tar.xz | |
Merge branch 'avination' into careminster
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.Inventory.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index 0837ca5..942c625 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
| @@ -2342,7 +2342,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2342 | } | 2342 | } |
| 2343 | else | 2343 | else |
| 2344 | { | 2344 | { |
| 2345 | if (!Permissions.CanEditObject(sog.UUID, remoteClient.AgentId)) | 2345 | if (!Permissions.IsGod(remoteClient.AgentId) && sog.OwnerID != remoteClient.AgentId) |
| 2346 | continue; | ||
| 2347 | |||
| 2348 | if (!Permissions.CanTransferObject(sog.UUID, groupID)) | ||
| 2346 | continue; | 2349 | continue; |
| 2347 | 2350 | ||
| 2348 | if (sog.GroupID != groupID) | 2351 | if (sog.GroupID != groupID) |