From 87d810217e2675880bec68891431bd5d422cb1b8 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 22 Sep 2012 14:01:51 -0700
Subject: Guard against inventory get failures.

---
 OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'OpenSim/Region/CoreModules')

diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index d6ad07e..c74584c 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -859,6 +859,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
 
             InventoryItemBase item = new InventoryItemBase(itemID, sp.UUID);
             item = m_scene.InventoryService.GetItem(item);
+            if (item == null)
+                return;
+
             bool changed = sp.Appearance.SetAttachment((int)AttachmentPt, itemID, item.AssetID);
             if (changed && m_scene.AvatarFactory != null)
             {
-- 
cgit v1.1