From 5655239f440dce36cdf9288db70be567aef2d565 Mon Sep 17 00:00:00 2001
From: Talun
Date: Mon, 16 Apr 2012 20:24:56 +0100
Subject: Null reference in llGetObjectMass on a seated avatar.

---
 OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Region/ScriptEngine/Shared/Api')

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
                             // child agents have a mass of 1.0
                             return 1;
                         else
-                            return (double)avatar.PhysicsActor.Mass;
+                            return (double)avatar.GetMass();
                 }
                 catch (KeyNotFoundException)
                 {
-- 
cgit v1.1