diff options
author | Adam Frisby | 2008-05-14 16:51:16 +0000 |
---|---|---|
committer | Adam Frisby | 2008-05-14 16:51:16 +0000 |
commit | c9c016e26a6d73a0bea1cbdc66fbc2595f58bf94 (patch) | |
tree | 861da7c88027fcd1264fbed23316845f10e0f985 /OpenSim/Region/Environment/Scenes | |
parent | fix for a change in inventory that meant I was returning a lot (diff) | |
download | opensim-SC_OLD-c9c016e26a6d73a0bea1cbdc66fbc2595f58bf94.zip opensim-SC_OLD-c9c016e26a6d73a0bea1cbdc66fbc2595f58bf94.tar.gz opensim-SC_OLD-c9c016e26a6d73a0bea1cbdc66fbc2595f58bf94.tar.bz2 opensim-SC_OLD-c9c016e26a6d73a0bea1cbdc66fbc2595f58bf94.tar.xz |
* Applying patches from Melanie to cover permissions module. Thanks!
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/ScenePresence.cs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs index 2901a97..2829f7e 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs | |||
@@ -471,6 +471,12 @@ namespace OpenSim.Region.Environment.Scenes | |||
471 | 471 | ||
472 | public uint GenerateClientFlags(LLUUID ObjectID) | 472 | public uint GenerateClientFlags(LLUUID ObjectID) |
473 | { | 473 | { |
474 | if(m_scene.Permissions == null) | ||
475 | { | ||
476 | SceneObjectPart task=m_scene.GetSceneObjectPart(ObjectID); | ||
477 | |||
478 | return task.GetEffectiveObjectFlags() | (uint)2147483647; | ||
479 | } | ||
474 | return m_scene.Permissions.GenerateClientFlags(m_uuid, ObjectID); | 480 | return m_scene.Permissions.GenerateClientFlags(m_uuid, ObjectID); |
475 | } | 481 | } |
476 | 482 | ||