diff options
author | teravus | 2013-01-21 21:34:49 -0500 |
---|---|---|
committer | teravus | 2013-01-21 21:34:49 -0500 |
commit | 6007eae00ff2b1cb451609f5c3da4f85521520c9 (patch) | |
tree | de5ccef834b283872959d56257dc9f061c3da099 /OpenSim/Region/ScriptEngine/Shared | |
parent | * The fallthrough of FetchTexture was no longer resulting in a 404 response o... (diff) | |
parent | Add accessors to allow serializing rot and position targets (diff) | |
download | opensim-SC-6007eae00ff2b1cb451609f5c3da4f85521520c9.zip opensim-SC-6007eae00ff2b1cb451609f5c3da4f85521520c9.tar.gz opensim-SC-6007eae00ff2b1cb451609f5c3da4f85521520c9.tar.bz2 opensim-SC-6007eae00ff2b1cb451609f5c3da4f85521520c9.tar.xz |
Merge remote-tracking branch 'remotes/origin/avination' into teravuswork
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 2 |
1 files changed, 0 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 617f382..fcb68b2 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -7782,8 +7782,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7782 | m_host.AddScriptLPS(1); | 7782 | m_host.AddScriptLPS(1); |
7783 | 7783 | ||
7784 | setLinkPrimParams(linknumber, rules, "llSetLinkPrimitiveParamsFast"); | 7784 | setLinkPrimParams(linknumber, rules, "llSetLinkPrimitiveParamsFast"); |
7785 | |||
7786 | ScriptSleep(200); | ||
7787 | } | 7785 | } |
7788 | 7786 | ||
7789 | private void setLinkPrimParams(int linknumber, LSL_List rules, string originFunc) | 7787 | private void setLinkPrimParams(int linknumber, LSL_List rules, string originFunc) |