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.
---
 OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs')

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index 108089e..e40e57d 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -112,15 +112,17 @@ namespace OpenSim.Region.Framework.Scenes
         }
 
         /// <summary>
-        /// Reset UUIDs for all the items in the prim's inventory.  This involves either generating
+        /// Reset UUIDs for all the items in the prim's inventory.
+        /// </summary>
+        /// <remarks>
+        /// This involves either generating
         /// new ones or setting existing UUIDs to the correct parent UUIDs.
         ///
         /// If this method is called and there are inventory items, then we regard the inventory as having changed.
-        /// </summary>
-        /// <param name="linkNum">Link number for the part</param>
+        /// </remarks>
         public void ResetInventoryIDs()
         {
-            if (null == m_part || null == m_part.ParentGroup)
+            if (null == m_part)
                 return;
             
             lock (m_items)
-- 
cgit v1.1