From 8185ce8b4afab459655f5cd362b2c6bbb98c28c3 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 3 Dec 2011 00:30:13 +0000
Subject: Do a cagent.Anims != null check in SP.CopyFrom()

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

(limited to 'OpenSim/Region/Framework')

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index c517978..7156137 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -3195,7 +3195,9 @@ namespace OpenSim.Region.Framework.Scenes
             }
             catch { }
 
-            Animator.Animations.FromArray(cAgent.Anims);
+            // FIXME: Why is this null check necessary?  Where are the cases where we get a null Anims object?
+            if (cAgent.Anims != null)
+                Animator.Animations.FromArray(cAgent.Anims);
 
             if (cAgent.AttachmentObjects != null && cAgent.AttachmentObjects.Count > 0)
             {
-- 
cgit v1.1