aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorTalun2012-04-16 20:24:56 +0100
committerJustin Clark-Casey (justincc)2012-04-17 00:56:46 +0100
commit5655239f440dce36cdf9288db70be567aef2d565 (patch)
tree2f379780ee2acce2409701e3df4973bf7c42d229 /OpenSim/Region
parentUse INSERT OR REPLACE INTO sql in WebStatsModule for session update rather th... (diff)
downloadopensim-SC_OLD-5655239f440dce36cdf9288db70be567aef2d565.zip
opensim-SC_OLD-5655239f440dce36cdf9288db70be567aef2d565.tar.gz
opensim-SC_OLD-5655239f440dce36cdf9288db70be567aef2d565.tar.bz2
opensim-SC_OLD-5655239f440dce36cdf9288db70be567aef2d565.tar.xz
Null reference in llGetObjectMass on a seated avatar.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index a19427d..5581727 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -9255,7 +9255,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9255 // child agents have a mass of 1.0 9255 // child agents have a mass of 1.0
9256 return 1; 9256 return 1;
9257 else 9257 else
9258 return (double)avatar.PhysicsActor.Mass; 9258 return (double)avatar.GetMass();
9259 } 9259 }
9260 catch (KeyNotFoundException) 9260 catch (KeyNotFoundException)
9261 { 9261 {