diff options
author | Justin Clark-Casey (justincc) | 2011-09-01 23:06:57 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-09-01 23:06:57 +0100 |
commit | 8b83c4a4331e759b83112a4e04558ed961ff891a (patch) | |
tree | ed23eddd4a701b7b7bc39e4db9b2500760498e27 /OpenSim/Region/CoreModules/Framework/InventoryAccess | |
parent | Remove code which was automatically deleting non-root prims from scene object... (diff) | |
download | opensim-SC_OLD-8b83c4a4331e759b83112a4e04558ed961ff891a.zip opensim-SC_OLD-8b83c4a4331e759b83112a4e04558ed961ff891a.tar.gz opensim-SC_OLD-8b83c4a4331e759b83112a4e04558ed961ff891a.tar.bz2 opensim-SC_OLD-8b83c4a4331e759b83112a4e04558ed961ff891a.tar.xz |
Remove pointless NRE check in IAM.RezObject() since this can never occur
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/InventoryAccess')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | 16 |
1 files changed, 1 insertions, 15 deletions
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 | |||
865 | group.SetFromItemID(itemID); | 865 | group.SetFromItemID(itemID); |
866 | } | 866 | } |
867 | 867 | ||
868 | SceneObjectPart rootPart = null; | 868 | SceneObjectPart rootPart = group.GetChildPart(group.UUID); |
869 | |||
870 | try | ||
871 | { | ||
872 | rootPart = group.GetChildPart(group.UUID); | ||
873 | } | ||
874 | catch (NullReferenceException) | ||
875 | { | ||
876 | string isAttachment = ""; | ||
877 | |||
878 | if (attachment) | ||
879 | isAttachment = " Object was an attachment"; | ||
880 | |||
881 | m_log.Error("[AGENT INVENTORY]: Error rezzing ItemID: " + itemID + " object has no rootpart." + isAttachment); | ||
882 | } | ||
883 | 869 | ||
884 | // Since renaming the item in the inventory does not | 870 | // Since renaming the item in the inventory does not |
885 | // affect the name stored in the serialization, transfer | 871 | // affect the name stored in the serialization, transfer |