aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs3
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs3
2 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 78e3a83..1a3971d 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -1434,6 +1434,9 @@ namespace OpenSim.Region.Environment.Scenes
1434 foreach (UUID taskID in taskIDict.Keys) 1434 foreach (UUID taskID in taskIDict.Keys)
1435 { 1435 {
1436 UnRegisterControlEventsToScript(LocalId, taskID); 1436 UnRegisterControlEventsToScript(LocalId, taskID);
1437 taskIDict[taskID].PermsMask &= ~(
1438 2048 | //PERMISSION_CONTROL_CAMERA
1439 4); // PERMISSION_TAKE_CONTROLS
1437 } 1440 }
1438 } 1441 }
1439 1442
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 34a3a26..393e708 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -2958,7 +2958,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
2958 // When agent is sitting, certain permissions are implicit if requested from sitting agent 2958 // When agent is sitting, certain permissions are implicit if requested from sitting agent
2959 int implicitPerms = ScriptBaseClass.PERMISSION_TRIGGER_ANIMATION | 2959 int implicitPerms = ScriptBaseClass.PERMISSION_TRIGGER_ANIMATION |
2960 ScriptBaseClass.PERMISSION_CONTROL_CAMERA | 2960 ScriptBaseClass.PERMISSION_CONTROL_CAMERA |
2961 ScriptBaseClass.PERMISSION_TRACK_CAMERA; 2961 ScriptBaseClass.PERMISSION_TRACK_CAMERA |
2962 ScriptBaseClass.PERMISSION_TAKE_CONTROLS;
2962 2963
2963 if ((perm & (~implicitPerms)) == 0) // Requested only implicit perms 2964 if ((perm & (~implicitPerms)) == 0) // Requested only implicit perms
2964 { 2965 {