From 197163e12a265af66a9393bc6753c7a50520c5b1 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Fri, 4 May 2012 21:00:41 +0200
Subject: Fix teleporting from older to newer regions

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

(limited to 'OpenSim/Framework/ChildAgentDataUpdate.cs')

diff --git a/OpenSim/Framework/ChildAgentDataUpdate.cs b/OpenSim/Framework/ChildAgentDataUpdate.cs
index 7962ff4..e718aa6 100644
--- a/OpenSim/Framework/ChildAgentDataUpdate.cs
+++ b/OpenSim/Framework/ChildAgentDataUpdate.cs
@@ -602,7 +602,14 @@ namespace OpenSim.Framework
 
             if (args["default_animation"] != null)
             {
-                DefaultAnim = new Animation((OSDMap)args["default_animation"]);
+                try
+                {
+                    DefaultAnim = new Animation((OSDMap)args["default_animation"]);
+                }
+                catch
+                {
+                    DefaultAnim = null;
+                }
             }
 
             //if ((args["agent_textures"] != null) && (args["agent_textures"]).Type == OSDType.Array)
-- 
cgit v1.1