aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorTom2010-08-05 08:15:05 -0700
committerTom2010-08-05 08:15:05 -0700
commit85fd2def9ce04d68d838439e7931b8358db84ebd (patch)
treed5bd575ff640b14d25387e09ec5ed8b6623f5de3 /OpenSim/Region
parentMerge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff)
downloadopensim-SC_OLD-85fd2def9ce04d68d838439e7931b8358db84ebd.zip
opensim-SC_OLD-85fd2def9ce04d68d838439e7931b8358db84ebd.tar.gz
opensim-SC_OLD-85fd2def9ce04d68d838439e7931b8358db84ebd.tar.bz2
opensim-SC_OLD-85fd2def9ce04d68d838439e7931b8358db84ebd.tar.xz
Enforce a 0.2 second sleep on llDie() before the command is executed - this should get rid of ghost prims (which are much rarer, but still occuring)
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs7
1 files changed, 6 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 0a1a10c..411c811 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -1173,7 +1173,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
1173 public virtual void llDie() 1173 public virtual void llDie()
1174 { 1174 {
1175 m_host.AddScriptLPS(1); 1175 m_host.AddScriptLPS(1);
1176 if (!m_host.IsAttachment) throw new SelfDeleteException(); 1176 if (!m_host.IsAttachment)
1177 {
1178 //Enforce a sleep here to avoid ghost prims
1179 llSleep(0.2d);
1180 throw new SelfDeleteException();
1181 }
1177 } 1182 }
1178 1183
1179 public LSL_Float llGround(LSL_Vector offset) 1184 public LSL_Float llGround(LSL_Vector offset)