aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorMelanie Thielker2010-08-05 18:45:17 +0200
committerMelanie Thielker2010-08-05 18:45:17 +0200
commit05520d676ccee950c94d1f8c079afaaaabdb6a49 (patch)
treed4fa6c4b058be1ad777354523d52da075503fadb /OpenSim/Region
parentllRequestSimulatorData DATA_SIM_POS : Divide by RegionSize, don't multiply. T... (diff)
downloadopensim-SC_OLD-05520d676ccee950c94d1f8c079afaaaabdb6a49.zip
opensim-SC_OLD-05520d676ccee950c94d1f8c079afaaaabdb6a49.tar.gz
opensim-SC_OLD-05520d676ccee950c94d1f8c079afaaaabdb6a49.tar.bz2
opensim-SC_OLD-05520d676ccee950c94d1f8c079afaaaabdb6a49.tar.xz
Revert "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)"
This reverts commit 85fd2def9ce04d68d838439e7931b8358db84ebd. The sleep helps in only one case: static prims rezzed by script. In other cases (physical prims, bullets) it's harmful.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs7
1 files changed, 1 insertions, 6 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index d61715e..bc47fa1 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -1173,12 +1173,7 @@ 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) 1176 if (!m_host.IsAttachment) throw new SelfDeleteException();
1177 {
1178 //Enforce a sleep here to avoid ghost prims
1179 llSleep(0.2d);
1180 throw new SelfDeleteException();
1181 }
1182 } 1177 }
1183 1178
1184 public LSL_Float llGround(LSL_Vector offset) 1179 public LSL_Float llGround(LSL_Vector offset)