aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api/Runtime
diff options
context:
space:
mode:
authorMelanie2010-01-11 02:01:23 +0000
committerMelanie2010-01-11 02:01:23 +0000
commit0ae861d7d7055e8765bcc2ff6c592a65a5d6510d (patch)
treed3b9c168f3c78fdf5ae9ec19684f4a460bdc5368 /OpenSim/Region/ScriptEngine/Shared/Api/Runtime
parentMerge branch 'master' into careminster (diff)
parentAdds llRotTarget and the events at_rot_target and not_at_rot_target. (diff)
downloadopensim-SC-0ae861d7d7055e8765bcc2ff6c592a65a5d6510d.zip
opensim-SC-0ae861d7d7055e8765bcc2ff6c592a65a5d6510d.tar.gz
opensim-SC-0ae861d7d7055e8765bcc2ff6c592a65a5d6510d.tar.bz2
opensim-SC-0ae861d7d7055e8765bcc2ff6c592a65a5d6510d.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs7
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs
index 15e0408..3456a3c 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/Executor.cs
@@ -62,7 +62,8 @@ 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 listen = 32768, 67 listen = 32768,
67 money = 65536, 68 money = 65536,
68 moving_end = 131072, 69 moving_end = 131072,
@@ -204,8 +205,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
204 return; 205 return;
205 } 206 }
206 207
207 m_eventFlagsMap.Add("attach", scriptEvents.attach); 208 m_eventFlagsMap.Add("attach", scriptEvents.attach);
208 // m_eventFlagsMap.Add("at_rot_target",(long)scriptEvents.at_rot_target); 209 m_eventFlagsMap.Add("at_rot_target", scriptEvents.at_rot_target);
209 m_eventFlagsMap.Add("at_target", scriptEvents.at_target); 210 m_eventFlagsMap.Add("at_target", scriptEvents.at_target);
210 // m_eventFlagsMap.Add("changed",(long)scriptEvents.changed); 211 // m_eventFlagsMap.Add("changed",(long)scriptEvents.changed);
211 m_eventFlagsMap.Add("collision", scriptEvents.collision); 212 m_eventFlagsMap.Add("collision", scriptEvents.collision);