diff options
author | Melanie Thielker | 2008-07-31 12:25:18 +0000 |
---|---|---|
committer | Melanie Thielker | 2008-07-31 12:25:18 +0000 |
commit | 244ad2e61447164fdddc9b194d99658323c6c067 (patch) | |
tree | 580daef7913f2cae194fa87fe452952cf1c11dbf /OpenSim/Region/ScriptEngine/Common | |
parent | Thank you, sacha magne, for a patch that prevents sim chat from (diff) | |
download | opensim-SC-244ad2e61447164fdddc9b194d99658323c6c067.zip opensim-SC-244ad2e61447164fdddc9b194d99658323c6c067.tar.gz opensim-SC-244ad2e61447164fdddc9b194d99658323c6c067.tar.bz2 opensim-SC-244ad2e61447164fdddc9b194d99658323c6c067.tar.xz |
Thank you, HomerHorwitz, for a patch that add PERMISSION_CONTROL_CAMERA
Fixes Mantis #1861
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Common')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs | 1 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs b/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs index 3580d71..551c6f6 100644 --- a/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs +++ b/OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs | |||
@@ -2083,6 +2083,7 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
2083 | public const int PERMISSION_CHANGE_JOINTS = 256; | 2083 | public const int PERMISSION_CHANGE_JOINTS = 256; |
2084 | public const int PERMISSION_CHANGE_PERMISSIONS = 512; | 2084 | public const int PERMISSION_CHANGE_PERMISSIONS = 512; |
2085 | public const int PERMISSION_TRACK_CAMERA = 1024; | 2085 | public const int PERMISSION_TRACK_CAMERA = 1024; |
2086 | public const int PERMISSION_CONTROL_CAMERA = 2048; | ||
2086 | 2087 | ||
2087 | public const int AGENT_FLYING = 1; | 2088 | public const int AGENT_FLYING = 1; |
2088 | public const int AGENT_ATTACHMENTS = 2; | 2089 | public const int AGENT_ATTACHMENTS = 2; |
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs index 702cbfa..c386e38 100644 --- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs +++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs | |||
@@ -2559,6 +2559,7 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
2559 | // When attached, certain permissions are implicit if requested from owner | 2559 | // When attached, certain permissions are implicit if requested from owner |
2560 | int implicitPerms = BuiltIn_Commands_BaseClass.PERMISSION_TAKE_CONTROLS | | 2560 | int implicitPerms = BuiltIn_Commands_BaseClass.PERMISSION_TAKE_CONTROLS | |
2561 | BuiltIn_Commands_BaseClass.PERMISSION_TRIGGER_ANIMATION | | 2561 | BuiltIn_Commands_BaseClass.PERMISSION_TRIGGER_ANIMATION | |
2562 | BuiltIn_Commands_BaseClass.PERMISSION_CONTROL_CAMERA | | ||
2562 | BuiltIn_Commands_BaseClass.PERMISSION_ATTACH; | 2563 | BuiltIn_Commands_BaseClass.PERMISSION_ATTACH; |
2563 | 2564 | ||
2564 | if ((perm & (~implicitPerms)) == 0) // Requested only implicit perms | 2565 | if ((perm & (~implicitPerms)) == 0) // Requested only implicit perms |
@@ -2576,6 +2577,7 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
2576 | { | 2577 | { |
2577 | // When agent is sitting, certain permissions are implicit if requested from sitting agent | 2578 | // When agent is sitting, certain permissions are implicit if requested from sitting agent |
2578 | int implicitPerms = BuiltIn_Commands_BaseClass.PERMISSION_TRIGGER_ANIMATION | | 2579 | int implicitPerms = BuiltIn_Commands_BaseClass.PERMISSION_TRIGGER_ANIMATION | |
2580 | BuiltIn_Commands_BaseClass.PERMISSION_CONTROL_CAMERA | | ||
2579 | BuiltIn_Commands_BaseClass.PERMISSION_TRACK_CAMERA; | 2581 | BuiltIn_Commands_BaseClass.PERMISSION_TRACK_CAMERA; |
2580 | 2582 | ||
2581 | if ((perm & (~implicitPerms)) == 0) // Requested only implicit perms | 2583 | if ((perm & (~implicitPerms)) == 0) // Requested only implicit perms |