aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie Thielker2008-07-31 12:25:18 +0000
committerMelanie Thielker2008-07-31 12:25:18 +0000
commit244ad2e61447164fdddc9b194d99658323c6c067 (patch)
tree580daef7913f2cae194fa87fe452952cf1c11dbf
parentThank you, sacha magne, for a patch that prevents sim chat from (diff)
downloadopensim-SC_OLD-244ad2e61447164fdddc9b194d99658323c6c067.zip
opensim-SC_OLD-244ad2e61447164fdddc9b194d99658323c6c067.tar.gz
opensim-SC_OLD-244ad2e61447164fdddc9b194d99658323c6c067.tar.bz2
opensim-SC_OLD-244ad2e61447164fdddc9b194d99658323c6c067.tar.xz
Thank you, HomerHorwitz, for a patch that add PERMISSION_CONTROL_CAMERA
Fixes Mantis #1861
-rw-r--r--OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs1
-rw-r--r--OpenSim/Region/ScriptEngine/Common/BuiltIn_Commands_BaseClass.cs1
-rw-r--r--OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs1
5 files changed, 7 insertions, 0 deletions
diff --git a/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs b/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs
index b03e761..e1ab733 100644
--- a/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs
+++ b/OpenSim/Grid/ScriptEngine/DotNetEngine/Compiler/LSL/LSL_BaseClass.cs
@@ -1848,6 +1848,7 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler.LSL
1848 public const int PERMISSION_CHANGE_JOINTS = 256; 1848 public const int PERMISSION_CHANGE_JOINTS = 256;
1849 public const int PERMISSION_CHANGE_PERMISSIONS = 512; 1849 public const int PERMISSION_CHANGE_PERMISSIONS = 512;
1850 public const int PERMISSION_TRACK_CAMERA = 1024; 1850 public const int PERMISSION_TRACK_CAMERA = 1024;
1851 public const int PERMISSION_CONTROL_CAMERA = 2048;
1851 public const int AGENT_FLYING = 1; 1852 public const int AGENT_FLYING = 1;
1852 public const int AGENT_ATTACHMENTS = 2; 1853 public const int AGENT_ATTACHMENTS = 2;
1853 public const int AGENT_SCRIPTED = 4; 1854 public const int AGENT_SCRIPTED = 4;
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
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;