diff options
| author | Teravus Ovares (Dan Olivares) | 2009-11-26 17:03:19 -0500 |
|---|---|---|
| committer | Teravus Ovares (Dan Olivares) | 2009-11-26 17:03:19 -0500 |
| commit | f84da8e642adb7fdfc516f47aa3b0b0a8c4ba576 (patch) | |
| tree | 8b0b1fcac25c93f65c628e04b4dd767193d25cc1 /OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |
| parent | * Fixes a case of d.BodyEnable with IntPtr.Zero passed as the parameter in li... (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC_OLD-f84da8e642adb7fdfc516f47aa3b0b0a8c4ba576.zip opensim-SC_OLD-f84da8e642adb7fdfc516f47aa3b0b0a8c4ba576.tar.gz opensim-SC_OLD-f84da8e642adb7fdfc516f47aa3b0b0a8c4ba576.tar.bz2 opensim-SC_OLD-f84da8e642adb7fdfc516f47aa3b0b0a8c4ba576.tar.xz | |
Merge branch 'master' of ssh://MyConnection/var/git/opensim
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 1 |
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 fbbbfdc..5de23ad 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
| @@ -5784,6 +5784,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 5784 | m_host.AddScriptLPS(1); | 5784 | m_host.AddScriptLPS(1); |
| 5785 | return World.SimulatorFPS; | 5785 | return World.SimulatorFPS; |
| 5786 | } | 5786 | } |
| 5787 | |||
| 5787 | 5788 | ||
| 5788 | /* particle system rules should be coming into this routine as doubles, that is | 5789 | /* particle system rules should be coming into this routine as doubles, that is |
| 5789 | rule[0] should be an integer from this list and rule[1] should be the arg | 5790 | rule[0] should be an integer from this list and rule[1] should be the arg |