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/Shared | |
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/Shared')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 8bf149d..99af529 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -2437,6 +2437,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2437 | // When attached, certain permissions are implicit if requested from owner | 2437 | // When attached, certain permissions are implicit if requested from owner |
2438 | int implicitPerms = ScriptBaseClass.PERMISSION_TAKE_CONTROLS | | 2438 | int implicitPerms = ScriptBaseClass.PERMISSION_TAKE_CONTROLS | |
2439 | ScriptBaseClass.PERMISSION_TRIGGER_ANIMATION | | 2439 | ScriptBaseClass.PERMISSION_TRIGGER_ANIMATION | |
2440 | ScriptBaseClass.PERMISSION_CONTROL_CAMERA | | ||
2440 | ScriptBaseClass.PERMISSION_ATTACH; | 2441 | ScriptBaseClass.PERMISSION_ATTACH; |
2441 | 2442 | ||
2442 | if ((perm & (~implicitPerms)) == 0) // Requested only implicit perms | 2443 | if ((perm & (~implicitPerms)) == 0) // Requested only implicit perms |
@@ -2456,6 +2457,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2456 | { | 2457 | { |
2457 | // When agent is sitting, certain permissions are implicit if requested from sitting agent | 2458 | // When agent is sitting, certain permissions are implicit if requested from sitting agent |
2458 | int implicitPerms = ScriptBaseClass.PERMISSION_TRIGGER_ANIMATION | | 2459 | int implicitPerms = ScriptBaseClass.PERMISSION_TRIGGER_ANIMATION | |
2460 | ScriptBaseClass.PERMISSION_CONTROL_CAMERA | | ||
2459 | ScriptBaseClass.PERMISSION_TRACK_CAMERA; | 2461 | ScriptBaseClass.PERMISSION_TRACK_CAMERA; |
2460 | 2462 | ||
2461 | if ((perm & (~implicitPerms)) == 0) // Requested only implicit perms | 2463 | if ((perm & (~implicitPerms)) == 0) // Requested only implicit perms |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs index 1472144..810a655 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs | |||
@@ -76,6 +76,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase | |||
76 | public const int PERMISSION_CHANGE_JOINTS = 256; | 76 | public const int PERMISSION_CHANGE_JOINTS = 256; |
77 | public const int PERMISSION_CHANGE_PERMISSIONS = 512; | 77 | public const int PERMISSION_CHANGE_PERMISSIONS = 512; |
78 | public const int PERMISSION_TRACK_CAMERA = 1024; | 78 | public const int PERMISSION_TRACK_CAMERA = 1024; |
79 | public const int PERMISSION_CONTROL_CAMERA = 2048; | ||
79 | 80 | ||
80 | public const int AGENT_FLYING = 1; | 81 | public const int AGENT_FLYING = 1; |
81 | public const int AGENT_ATTACHMENTS = 2; | 82 | public const int AGENT_ATTACHMENTS = 2; |