diff options
| author | Melanie | 2012-08-29 03:31:13 +0100 |
|---|---|---|
| committer | Melanie | 2012-08-29 03:31:13 +0100 |
| commit | 899337b4a0584ce2371c3bfcc44387d0f090b792 (patch) | |
| tree | 3a3e862951a85889c3c5762d6d30b5dd80868864 /OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | implementing rule tracking (diff) | |
| download | opensim-SC_OLD-899337b4a0584ce2371c3bfcc44387d0f090b792.zip opensim-SC_OLD-899337b4a0584ce2371c3bfcc44387d0f090b792.tar.gz opensim-SC_OLD-899337b4a0584ce2371c3bfcc44387d0f090b792.tar.bz2 opensim-SC_OLD-899337b4a0584ce2371c3bfcc44387d0f090b792.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index 5bc78d6..ceff889 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
| @@ -3036,7 +3036,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 3036 | m_host.AddScriptLPS(1); | 3036 | m_host.AddScriptLPS(1); |
| 3037 | InitLSL(); | 3037 | InitLSL(); |
| 3038 | 3038 | ||
| 3039 | m_LSL_Api.SetPrimitiveParamsEx(prim, rules); | 3039 | m_LSL_Api.SetPrimitiveParamsEx(prim, rules, "osSetPrimitiveParams"); |
| 3040 | } | 3040 | } |
| 3041 | 3041 | ||
| 3042 | /// <summary> | 3042 | /// <summary> |