diff options
| author | Melanie | 2012-05-14 01:21:10 +0200 |
|---|---|---|
| committer | Melanie | 2012-05-14 01:21:10 +0200 |
| commit | 59826c15cea3ba4aa647d5d9545341d3e6df731f (patch) | |
| tree | 155d560d46067efe507512a6057db48d757c1c39 /OpenSim/Region/Framework | |
| parent | ubitODE fix force in case of mlinear motor offset present (diff) | |
| download | opensim-SC_OLD-59826c15cea3ba4aa647d5d9545341d3e6df731f.zip opensim-SC_OLD-59826c15cea3ba4aa647d5d9545341d3e6df731f.tar.gz opensim-SC_OLD-59826c15cea3ba4aa647d5d9545341d3e6df731f.tar.bz2 opensim-SC_OLD-59826c15cea3ba4aa647d5d9545341d3e6df731f.tar.xz | |
Allow non-gods to deed no-mod objects
Diffstat (limited to 'OpenSim/Region/Framework')
| -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 0089c7d..29465c0 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
| @@ -2338,7 +2338,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2338 | } | 2338 | } |
| 2339 | else | 2339 | else |
| 2340 | { | 2340 | { |
| 2341 | if (!Permissions.CanEditObject(sog.UUID, remoteClient.AgentId)) | 2341 | if (!Permissions.IsGod(remoteClient.AgentId) && sog.OwnerID != remoteClient.AgentId) |
| 2342 | continue; | ||
| 2343 | |||
| 2344 | if (!Permissions.CanTransferObject(sog.UUID, groupID)) | ||
| 2342 | continue; | 2345 | continue; |
| 2343 | 2346 | ||
| 2344 | if (sog.GroupID != groupID) | 2347 | if (sog.GroupID != groupID) |