From 095b3e5756bb3160b30c9c5670ba008fa13d2e66 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 1 Sep 2011 01:22:28 +0100
Subject: Remove pointless cluttering SOP.ParentGroup != null checks.

The only times when ParentGroup might be null is during regression tests (which might not be a valid thing) and when scene objects are being constructed from the database.
At all other times it's not possible for a SOP not to have a SOG parent.
---
 .../Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs  | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs')

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index d791885..7f3d84d 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -672,13 +672,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             CheckThreatLevel(ThreatLevel.VeryLow, "osSetPrimFloatOnWater");
 
             m_host.AddScriptLPS(1);
-            if (m_host.ParentGroup != null)
-            {
-                if (m_host.ParentGroup.RootPart != null)
-                {
-                    m_host.ParentGroup.RootPart.SetFloatOnWater(floatYN);
-                }
-            }
+
+            if (m_host.ParentGroup.RootPart != null)
+                m_host.ParentGroup.RootPart.SetFloatOnWater(floatYN);
         }
 
         // Teleport functions
-- 
cgit v1.1