From 8b83c4a4331e759b83112a4e04558ed961ff891a Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 1 Sep 2011 23:06:57 +0100
Subject: Remove pointless NRE check in IAM.RezObject() since this can never
 occur

---
 .../Framework/InventoryAccess/InventoryAccessModule.cs   | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

(limited to 'OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs')

diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index 1a591ee..76a1cd0 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -865,21 +865,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                             group.SetFromItemID(itemID);
                         }
 
-                        SceneObjectPart rootPart = null;
-
-                        try
-                        {
-                            rootPart = group.GetChildPart(group.UUID);
-                        }
-                        catch (NullReferenceException)
-                        {
-                            string isAttachment = "";
-
-                            if (attachment)
-                                isAttachment = " Object was an attachment";
-
-                            m_log.Error("[AGENT INVENTORY]: Error rezzing ItemID: " + itemID + " object has no rootpart." + isAttachment);
-                        }
+                        SceneObjectPart rootPart = group.GetChildPart(group.UUID);
 
                         // Since renaming the item in the inventory does not
                         // affect the name stored in the serialization, transfer
-- 
cgit v1.1