aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorMelanie Thielker2010-07-22 19:20:09 +0200
committerMelanie Thielker2010-07-22 19:20:09 +0200
commitce8b9b41815f518488e123a16e0ef85f7c467631 (patch)
treee7b75675acb14755826dbbf23ca6ae48872100da /OpenSim/Region
parentAllow megaregions to be used in M7, should we so decide (diff)
downloadopensim-SC-ce8b9b41815f518488e123a16e0ef85f7c467631.zip
opensim-SC-ce8b9b41815f518488e123a16e0ef85f7c467631.tar.gz
opensim-SC-ce8b9b41815f518488e123a16e0ef85f7c467631.tar.bz2
opensim-SC-ce8b9b41815f518488e123a16e0ef85f7c467631.tar.xz
LSL compatibility fix. Add 0.1 s sleep to llSetLinkPrimitiveParams so fade scripts will time correctly. The -Fast version works without a delay
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs5
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index a6f0cdd..de00db3 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -7165,7 +7165,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7165 SetPrimParams(m_host, rules); 7165 SetPrimParams(m_host, rules);
7166 } 7166 }
7167 7167
7168 public void llSetLinkPrimitiveParams(int linknumber, LSL_List rules) 7168 public void llSetLinkPrimitiveParamsFast(int linknumber, LSL_List rules)
7169 { 7169 {
7170 m_host.AddScriptLPS(1); 7170 m_host.AddScriptLPS(1);
7171 7171
@@ -7191,9 +7191,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
7191 } 7191 }
7192 } 7192 }
7193 7193
7194 public void llSetLinkPrimitiveParamsFast(int linknumber, LSL_List rules) 7194 public void llSetLinkPrimitiveParams(int linknumber, LSL_List rules)
7195 { 7195 {
7196 llSetLinkPrimitiveParams(linknumber, rules); 7196 llSetLinkPrimitiveParams(linknumber, rules);
7197 ScriptSleep(100);
7197 } 7198 }
7198 7199
7199 protected void SetPrimParams(ScenePresence av, LSL_List rules) 7200 protected void SetPrimParams(ScenePresence av, LSL_List rules)