From c1e7b45e18fc65fc8a40769d78606f72ad37c5a5 Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Mon, 4 Aug 2008 17:52:00 +0000
Subject: Fix wrong bitmask value in script engine that would make a mess of
 the ObjectFlags. Good catch, gsky, thank you!

---
 OpenSim/Region/ScriptEngine/Common/ExecutorBase.cs  | 2 +-
 OpenSim/Region/ScriptEngine/XEngine/ExecutorBase.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenSim')

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
         {
             None = 0,
             attach = 1,
-            collision = 15,
+            collision = 16,
             collision_end = 32,
             collision_start = 64,
             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
         {
             None = 0,
             attach = 1,
-            collision = 15,
+            collision = 16,
             collision_end = 32,
             collision_start = 64,
             control = 128,
-- 
cgit v1.1