diff options
| author | Jeff Ames | 2009-01-16 04:42:24 +0000 |
|---|---|---|
| committer | Jeff Ames | 2009-01-16 04:42:24 +0000 |
| commit | 23bd915ecd46bbf442aad66e7011a8d2e8e4028f (patch) | |
| tree | 5dfa8c15935ab4f85ebe729c85153d0ebb7ff297 /OpenSim/Region | |
| parent | Update svn properties. (diff) | |
| download | opensim-SC_OLD-23bd915ecd46bbf442aad66e7011a8d2e8e4028f.zip opensim-SC_OLD-23bd915ecd46bbf442aad66e7011a8d2e8e4028f.tar.gz opensim-SC_OLD-23bd915ecd46bbf442aad66e7011a8d2e8e4028f.tar.bz2 opensim-SC_OLD-23bd915ecd46bbf442aad66e7011a8d2e8e4028f.tar.xz | |
Minor formatting cleanup, add copyright header.
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/Environment/Scenes/ScenePresence.cs | 6 | ||||
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs index d2d8335..bdb0836 100644 --- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs | |||
| @@ -1433,9 +1433,9 @@ namespace OpenSim.Region.Environment.Scenes | |||
| 1433 | foreach (UUID taskID in taskIDict.Keys) | 1433 | foreach (UUID taskID in taskIDict.Keys) |
| 1434 | { | 1434 | { |
| 1435 | UnRegisterControlEventsToScript(LocalId, taskID); | 1435 | UnRegisterControlEventsToScript(LocalId, taskID); |
| 1436 | taskIDict[taskID].PermsMask &= ~( | 1436 | taskIDict[taskID].PermsMask &= ~( |
| 1437 | 2048 | //PERMISSION_CONTROL_CAMERA | 1437 | 2048 | //PERMISSION_CONTROL_CAMERA |
| 1438 | 4); // PERMISSION_TAKE_CONTROLS | 1438 | 4); // PERMISSION_TAKE_CONTROLS |
| 1439 | } | 1439 | } |
| 1440 | } | 1440 | } |
| 1441 | 1441 | ||
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 393e708..8fd1ba3 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -2957,9 +2957,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 2957 | { | 2957 | { |
| 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 | ScriptBaseClass.PERMISSION_TAKE_CONTROLS; |
| 2963 | 2963 | ||
| 2964 | if ((perm & (~implicitPerms)) == 0) // Requested only implicit perms | 2964 | if ((perm & (~implicitPerms)) == 0) // Requested only implicit perms |
| 2965 | { | 2965 | { |