diff options
| author | Teravus Ovares | 2008-05-14 23:25:07 +0000 |
|---|---|---|
| committer | Teravus Ovares | 2008-05-14 23:25:07 +0000 |
| commit | a4efa939932f823af2affe0e97446a8d807004e0 (patch) | |
| tree | 58f8b1341aa2a14178bf707841cd368d5394429f /OpenSim/Region/Environment/Scenes/ScenePresence.cs | |
| parent | * Refactored IConfigSource into Physics plug-ins and Scene. We can get rid of... (diff) | |
| download | opensim-SC_OLD-a4efa939932f823af2affe0e97446a8d807004e0.zip opensim-SC_OLD-a4efa939932f823af2affe0e97446a8d807004e0.tar.gz opensim-SC_OLD-a4efa939932f823af2affe0e97446a8d807004e0.tar.bz2 opensim-SC_OLD-a4efa939932f823af2affe0e97446a8d807004e0.tar.xz | |
* Comitting 0001271: [PATCH] Refactor permissions to fully allow stacking permissions modules. From Melanie. Thanks Melanie!
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/ScenePresence.cs')
| -rw-r--r-- | OpenSim/Region/Environment/Scenes/ScenePresence.cs | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs index 4ef0d27..8ac1a77 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs | |||
| @@ -476,13 +476,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
| 476 | 476 | ||
| 477 | public uint GenerateClientFlags(LLUUID ObjectID) | 477 | public uint GenerateClientFlags(LLUUID ObjectID) |
| 478 | { | 478 | { |
| 479 | if(m_scene.Permissions == null) | 479 | return m_scene.ExternalChecks.ExternalChecksGenerateClientFlags(m_uuid, ObjectID); |
| 480 | { | ||
| 481 | SceneObjectPart task=m_scene.GetSceneObjectPart(ObjectID); | ||
| 482 | |||
| 483 | return task.GetEffectiveObjectFlags() | (uint)2147483647; | ||
| 484 | } | ||
| 485 | return m_scene.Permissions.GenerateClientFlags(m_uuid, ObjectID); | ||
| 486 | } | 480 | } |
| 487 | 481 | ||
| 488 | /// <summary> | 482 | /// <summary> |