aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api/Implementation
diff options
context:
space:
mode:
authorMelanie2009-11-27 08:18:16 +0000
committerMelanie2009-11-27 08:18:16 +0000
commit0ddd1ce0b7ffc104c4d8170441d804c35c6fe5f6 (patch)
treee951d384ca1aa2011ae7a6fea667e7eed7226314 /OpenSim/Region/ScriptEngine/Shared/Api/Implementation
parentMerge branch 'master' into careminster (diff)
parentMake llDie virtual, since it's functionality is engine specific (diff)
downloadopensim-SC-0ddd1ce0b7ffc104c4d8170441d804c35c6fe5f6.zip
opensim-SC-0ddd1ce0b7ffc104c4d8170441d804c35c6fe5f6.tar.gz
opensim-SC-0ddd1ce0b7ffc104c4d8170441d804c35c6fe5f6.tar.bz2
opensim-SC-0ddd1ce0b7ffc104c4d8170441d804c35c6fe5f6.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 8274fbf..b387728 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -1052,7 +1052,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1052 return detectedParams.TouchUV; 1052 return detectedParams.TouchUV;
1053 } 1053 }
1054 1054
1055 public void llDie() 1055 public virtual void llDie()
1056 { 1056 {
1057 m_host.AddScriptLPS(1); 1057 m_host.AddScriptLPS(1);
1058 throw new SelfDeleteException(); 1058 throw new SelfDeleteException();