From 512ded6eb57019aed8aaa73d64b62d29450023cf Mon Sep 17 00:00:00 2001
From: root
Date: Thu, 16 Sep 2010 21:07:09 +0200
Subject: Catch a nullref

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

(limited to 'OpenSim/Region/CoreModules/Avatar')

diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index 5378930..7c95658 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -334,7 +334,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
                 if (m_scene.InventoryService != null)
                     item = m_scene.InventoryService.GetItem(item);
 
-                presence.Appearance.SetAttachment((int)AttachmentPt, itemID, item.AssetID /*att.UUID*/);
+				if (presence.Appearance != null)
+					presence.Appearance.SetAttachment((int)AttachmentPt, itemID, item.AssetID /*att.UUID*/);
             }
             
             return att.UUID;
-- 
cgit v1.1