diff options
| author | Melanie Thielker | 2008-08-04 17:52:00 +0000 |
|---|---|---|
| committer | Melanie Thielker | 2008-08-04 17:52:00 +0000 |
| commit | c1e7b45e18fc65fc8a40769d78606f72ad37c5a5 (patch) | |
| tree | 4a0d2efcab1d7b2895b55bc7688ca4a16d3c54fe | |
| parent | Addresses Mantis #1886 (diff) | |
| download | opensim-SC-c1e7b45e18fc65fc8a40769d78606f72ad37c5a5.zip opensim-SC-c1e7b45e18fc65fc8a40769d78606f72ad37c5a5.tar.gz opensim-SC-c1e7b45e18fc65fc8a40769d78606f72ad37c5a5.tar.bz2 opensim-SC-c1e7b45e18fc65fc8a40769d78606f72ad37c5a5.tar.xz | |
Fix wrong bitmask value in script engine that would make a mess of
the ObjectFlags. Good catch, gsky, thank you!
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Common/ExecutorBase.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Region/ScriptEngine/XEngine/ExecutorBase.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/ExecutorBase.cs b/OpenSim/Region/ScriptEngine/Common/ExecutorBase.cs index 2887f1e..3b7e88e 100644 --- a/OpenSim/Region/ScriptEngine/Common/ExecutorBase.cs +++ b/OpenSim/Region/ScriptEngine/Common/ExecutorBase.cs | |||
| @@ -69,7 +69,7 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
| 69 | { | 69 | { |
| 70 | None = 0, | 70 | None = 0, |
| 71 | attach = 1, | 71 | attach = 1, |
| 72 | collision = 15, | 72 | collision = 16, |
| 73 | collision_end = 32, | 73 | collision_end = 32, |
| 74 | collision_start = 64, | 74 | collision_start = 64, |
| 75 | control = 128, | 75 | control = 128, |
diff --git a/OpenSim/Region/ScriptEngine/XEngine/ExecutorBase.cs b/OpenSim/Region/ScriptEngine/XEngine/ExecutorBase.cs index 799005c..79c3cc9 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/ExecutorBase.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/ExecutorBase.cs | |||
| @@ -48,7 +48,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
| 48 | { | 48 | { |
| 49 | None = 0, | 49 | None = 0, |
| 50 | attach = 1, | 50 | attach = 1, |
| 51 | collision = 15, | 51 | collision = 16, |
| 52 | collision_end = 32, | 52 | collision_end = 32, |
| 53 | collision_start = 64, | 53 | collision_start = 64, |
| 54 | control = 128, | 54 | control = 128, |