aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api/Runtime
diff options
context:
space:
mode:
authorMelanie2010-01-11 02:04:58 +0000
committerMelanie2010-01-11 02:04:58 +0000
commit649d45a2d484f92765699920faf528891aba22a9 (patch)
treea464685ab19c0c6a358e37e87787b1c7ab1bee08 /OpenSim/Region/ScriptEngine/Shared/Api/Runtime
parentMerge branch 'master' into careminster (diff)
parentWhitespace cleanup (diff)
downloadopensim-SC-649d45a2d484f92765699920faf528891aba22a9.zip
opensim-SC-649d45a2d484f92765699920faf528891aba22a9.tar.gz
opensim-SC-649d45a2d484f92765699920faf528891aba22a9.tar.bz2
opensim-SC-649d45a2d484f92765699920faf528891aba22a9.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Runtime')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs
index 3456a3c..943d7a2 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs
@@ -62,7 +62,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
62 land_collision = 2048, 62 land_collision = 2048,
63 land_collision_end = 4096, 63 land_collision_end = 4096,
64 land_collision_start = 8192, 64 land_collision_start = 8192,
65 at_target = 16384, 65 at_target = 16384,
66 at_rot_target = 16777216, 66 at_rot_target = 16777216,
67 listen = 32768, 67 listen = 32768,
68 money = 65536, 68 money = 65536,
@@ -205,7 +205,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
205 return; 205 return;
206 } 206 }
207 207
208 m_eventFlagsMap.Add("attach", scriptEvents.attach); 208 m_eventFlagsMap.Add("attach", scriptEvents.attach);
209 m_eventFlagsMap.Add("at_rot_target", scriptEvents.at_rot_target); 209 m_eventFlagsMap.Add("at_rot_target", scriptEvents.at_rot_target);
210 m_eventFlagsMap.Add("at_target", scriptEvents.at_target); 210 m_eventFlagsMap.Add("at_target", scriptEvents.at_target);
211 // m_eventFlagsMap.Add("changed",(long)scriptEvents.changed); 211 // m_eventFlagsMap.Add("changed",(long)scriptEvents.changed);