aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
diff options
context:
space:
mode:
authorMelanie2009-11-26 17:45:09 +0000
committerMelanie2009-11-26 17:45:09 +0000
commited148eba324cf72b4100f83f6d5f7cb35cb46bba (patch)
treeb8f813d74183776a70b6752e5b409dcc169de019 /OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
parentMerge branch 'master' into careminster (diff)
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC_OLD-ed148eba324cf72b4100f83f6d5f7cb35cb46bba.zip
opensim-SC_OLD-ed148eba324cf72b4100f83f6d5f7cb35cb46bba.tar.gz
opensim-SC_OLD-ed148eba324cf72b4100f83f6d5f7cb35cb46bba.tar.bz2
opensim-SC_OLD-ed148eba324cf72b4100f83f6d5f7cb35cb46bba.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs1
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 6e5436a..8274fbf 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -5840,6 +5840,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
5840 m_host.AddScriptLPS(1); 5840 m_host.AddScriptLPS(1);
5841 return World.SimulatorFPS; 5841 return World.SimulatorFPS;
5842 } 5842 }
5843
5843 5844
5844 /* particle system rules should be coming into this routine as doubles, that is 5845 /* particle system rules should be coming into this routine as doubles, that is
5845 rule[0] should be an integer from this list and rule[1] should be the arg 5846 rule[0] should be an integer from this list and rule[1] should be the arg