diff options
| author | Homer Horwitz | 2008-12-01 22:28:17 +0000 |
|---|---|---|
| committer | Homer Horwitz | 2008-12-01 22:28:17 +0000 |
| commit | 4480d5527b4f88ffc0cd22ec87e7842e786e77a3 (patch) | |
| tree | b0f9eddc39dc85824883b66a61f70c45964c8677 /OpenSim/Region | |
| parent | don't close eventqueues when you leave a region. This really does seem (diff) | |
| download | opensim-SC_OLD-4480d5527b4f88ffc0cd22ec87e7842e786e77a3.zip opensim-SC_OLD-4480d5527b4f88ffc0cd22ec87e7842e786e77a3.tar.gz opensim-SC_OLD-4480d5527b4f88ffc0cd22ec87e7842e786e77a3.tar.bz2 opensim-SC_OLD-4480d5527b4f88ffc0cd22ec87e7842e786e77a3.tar.xz | |
Fix Mantis#2527. Permissions returned false for editing non-root SOPs. Now,
they will use the SOG the SOP belongs to (as it was for the root-SOP already).
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs index 92e040f..1fe7df7 100644 --- a/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs +++ b/OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs | |||
| @@ -698,6 +698,14 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions | |||
| 698 | 698 | ||
| 699 | SceneObjectPart part = m_scene.GetSceneObjectPart(objectID); | 699 | SceneObjectPart part = m_scene.GetSceneObjectPart(objectID); |
| 700 | 700 | ||
| 701 | // If we selected a sub-prim to edit, the objectID won't represent the object, but only a part. | ||
| 702 | // We have to check the permissions of the group, though. | ||
| 703 | if (part.ParentID != 0) | ||
| 704 | { | ||
| 705 | objectID = part.ParentUUID; | ||
| 706 | part = m_scene.GetSceneObjectPart(objectID); | ||
| 707 | } | ||
| 708 | |||
| 701 | // TODO: add group support! | 709 | // TODO: add group support! |
| 702 | // | 710 | // |
| 703 | if (part.OwnerID != editorID) | 711 | if (part.OwnerID != editorID) |