aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api/Runtime
diff options
context:
space:
mode:
authorKitto Flora2010-03-19 19:14:09 -0400
committerKitto Flora2010-03-19 19:14:09 -0400
commit0f5fb6f1901b0950ac52446702b07c91d16724d7 (patch)
tree72305ac8d95eccd4e7432538f061429e25e3418d /OpenSim/Region/ScriptEngine/Shared/Api/Runtime
parentFix AbsolutePosition for autopilot/sit. (diff)
parentMerge branch 'master' into careminster-presence-refactor (diff)
downloadopensim-SC-0f5fb6f1901b0950ac52446702b07c91d16724d7.zip
opensim-SC-0f5fb6f1901b0950ac52446702b07c91d16724d7.tar.gz
opensim-SC-0f5fb6f1901b0950ac52446702b07c91d16724d7.tar.bz2
opensim-SC-0f5fb6f1901b0950ac52446702b07c91d16724d7.tar.xz
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Runtime')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs2
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
index 3339995..e86d08c 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
@@ -26,6 +26,7 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Diagnostics; //for [DebuggerNonUserCode]
29using System.Runtime.Remoting.Lifetime; 30using System.Runtime.Remoting.Lifetime;
30using System.Threading; 31using System.Threading;
31using System.Reflection; 32using System.Reflection;
@@ -309,6 +310,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
309 m_LSL_Functions.llDialog(avatar, message, buttons, chat_channel); 310 m_LSL_Functions.llDialog(avatar, message, buttons, chat_channel);
310 } 311 }
311 312
313 [DebuggerNonUserCode]
312 public void llDie() 314 public void llDie()
313 { 315 {
314 m_LSL_Functions.llDie(); 316 m_LSL_Functions.llDie();