3 files changed, 3 insertions, 13 deletions

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 8d95546..2fd98f6 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -2767,8 +2767,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     // If either of these are null, then there was an unknown error.
                     if (new_group == null)
                         continue;
-                    if (new_group.RootPart == null)
-                        continue;
 
                     // objects rezzed with this method are die_at_edge by default.
                     new_group.RootPart.SetDieAtEdge(true);
@@ -6983,10 +6981,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                         {
                             // we are a child. The rotation values will be set to the one of root modified by rot, as in SL. Don't ask.
                             SceneObjectPart rootPart = part.ParentGroup.RootPart;
-                            if (rootPart != null) //  better safe than sorry
-                            {
-                                SetRot(part, rootPart.RotationOffset * Rot2Quaternion(q));
-                            }
+                            SetRot(part, rootPart.RotationOffset * Rot2Quaternion(q));
                         }
 
                         break;
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 7f3d84d..3ddd79b 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -673,8 +673,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
             m_host.AddScriptLPS(1);
 
-            if (m_host.ParentGroup.RootPart != null)
-                m_host.ParentGroup.RootPart.SetFloatOnWater(floatYN);
+            m_host.ParentGroup.RootPart.SetFloatOnWater(floatYN);
         }
 
         // Teleport functions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
index 08dc71e..5c4174e 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs
@@ -99,11 +99,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
             m_log.Debug("Paid: " + objectID + " from " + agentID + ", amount " + amount);
 
             part = part.ParentGroup.RootPart;
-
-            if (part != null)
-            {
-                money(part.LocalId, agentID, amount);
-            }
+            money(part.LocalId, agentID, amount);
         }
 
         /// <summary>