From 6274317e63e18785a2c3d96514ca371e0a04cf71 Mon Sep 17 00:00:00 2001
From: Melanie Thielker
Date: Sat, 26 Jun 2010 06:16:24 +0200
Subject: Fix loading of attachments on login

---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

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

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 654e9ce..4a4cac9 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -4151,7 +4151,14 @@ Console.WriteLine("Scripted Sit ofset {0}", m_pos);
             {
                 m_log.DebugFormat("[ATTACHMENT]: Loading attachment data from attachment service");
                 stateData = attServ.Get(ControllingClient.AgentId.ToString());
-                doc.LoadXml(stateData);
+                if (stateData != String.Empty)
+                {
+                    try
+                    {
+                        doc.LoadXml(stateData);
+                    }
+                    catch { }
+                }
             }
 
             Dictionary<UUID, string> itemData = new Dictionary<UUID, string>();
-- 
cgit v1.1