From e0f9b1a69994be3e5771ebdcb0f2c253f67150db Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Wed, 5 May 2010 21:12:02 +0200
Subject: Removed a test for a "can't happen" case. ParentGroup is never null
 anymore.

---
 .../Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs   | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

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

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index d216eff..6ab3c62 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -2033,14 +2033,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             float ground = World.GetGroundHeight((float)targetPos.x, (float)targetPos.y);
             bool disable_underground_movement = m_ScriptEngine.Config.GetBoolean("DisableUndergroundMovement", true);
 
-            if (part.ParentGroup == null)
-            {
-                if ((targetPos.z < ground) && disable_underground_movement)
-                    targetPos.z = ground;
-                    LSL_Vector real_vec = SetPosAdjust(currentPos, targetPos);
-                    part.UpdateOffSet(new Vector3((float)real_vec.x, (float)real_vec.y, (float)real_vec.z));
-            }
-            else if (part.ParentGroup.RootPart == part)
+            if (part.ParentGroup.RootPart == part)
             {
                 if ((targetPos.z < ground) && disable_underground_movement)
                     targetPos.z = ground;
@@ -2050,7 +2043,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             }
             else
             {
-                //it's late... i think this is right ?
                 if (llVecDist(new LSL_Vector(0,0,0), targetPos) <= 10.0f)
                 {
                     part.OffsetPosition = new Vector3((float)targetPos.x, (float)targetPos.y, (float)targetPos.z);
-- 
cgit v1.1