diff options
| author | Makopoppo | 2011-06-25 11:13:55 +0900 |
|---|---|---|
| committer | BlueWall | 2011-06-28 11:48:29 -0400 |
| commit | ee92f22f2ab9a1f2926ac3a9d4e1b9c26945d898 (patch) | |
| tree | 30a4464288c3250f56c11e8850c4e9b42d2aed07 /OpenSim | |
| parent | [PATCH] osSetSpeed() will accept float number (diff) | |
| download | opensim-SC_OLD-ee92f22f2ab9a1f2926ac3a9d4e1b9c26945d898.zip opensim-SC_OLD-ee92f22f2ab9a1f2926ac3a9d4e1b9c26945d898.tar.gz opensim-SC_OLD-ee92f22f2ab9a1f2926ac3a9d4e1b9c26945d898.tar.bz2 opensim-SC_OLD-ee92f22f2ab9a1f2926ac3a9d4e1b9c26945d898.tar.xz | |
[PATCH 2/2] [FIX] osGetPrimitiveParams() and osSetPrimitiveParams()
crashes throwing System.NullReferenceException
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index b098f09..963727d 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
| @@ -2295,6 +2295,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 2295 | { | 2295 | { |
| 2296 | CheckThreatLevel(ThreatLevel.High, "osGetPrimitiveParams"); | 2296 | CheckThreatLevel(ThreatLevel.High, "osGetPrimitiveParams"); |
| 2297 | m_host.AddScriptLPS(1); | 2297 | m_host.AddScriptLPS(1); |
| 2298 | InitLSL(); | ||
| 2298 | 2299 | ||
| 2299 | return m_LSL_Api.GetLinkPrimitiveParamsEx(prim, rules); | 2300 | return m_LSL_Api.GetLinkPrimitiveParamsEx(prim, rules); |
| 2300 | } | 2301 | } |
| @@ -2303,6 +2304,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 2303 | { | 2304 | { |
| 2304 | CheckThreatLevel(ThreatLevel.High, "osSetPrimitiveParams"); | 2305 | CheckThreatLevel(ThreatLevel.High, "osSetPrimitiveParams"); |
| 2305 | m_host.AddScriptLPS(1); | 2306 | m_host.AddScriptLPS(1); |
| 2307 | InitLSL(); | ||
| 2306 | 2308 | ||
| 2307 | m_LSL_Api.SetPrimitiveParamsEx(prim, rules); | 2309 | m_LSL_Api.SetPrimitiveParamsEx(prim, rules); |
| 2308 | } | 2310 | } |