aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
diff options
context:
space:
mode:
authorMelanie2012-05-14 01:21:10 +0200
committerMelanie2012-05-14 01:21:10 +0200
commit59826c15cea3ba4aa647d5d9545341d3e6df731f (patch)
tree155d560d46067efe507512a6057db48d757c1c39 /OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
parentubitODE fix force in case of mlinear motor offset present (diff)
downloadopensim-SC-59826c15cea3ba4aa647d5d9545341d3e6df731f.zip
opensim-SC-59826c15cea3ba4aa647d5d9545341d3e6df731f.tar.gz
opensim-SC-59826c15cea3ba4aa647d5d9545341d3e6df731f.tar.bz2
opensim-SC-59826c15cea3ba4aa647d5d9545341d3e6df731f.tar.xz
Allow non-gods to deed no-mod objects
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.Inventory.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs5
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)