From db558591259587bbf79c2358350385e0bbb5d286 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 4 Jan 2011 11:30:08 -0800
Subject: Guard against null Animator.

---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 3 ++-
 1 file changed, 2 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 46234f9..0648c58 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2499,7 +2499,8 @@ namespace OpenSim.Region.Framework.Scenes
 //            m_log.WarnFormat("[SP] Send avatar data from {0} to {1}",m_uuid,avatar.ControllingClient.AgentId);
 
             avatar.ControllingClient.SendAvatarDataImmediate(this);
-            Animator.SendAnimPackToClient(avatar.ControllingClient);
+            if (Animation != null)
+                Animator.SendAnimPackToClient(avatar.ControllingClient);
         }
 
         /// <summary>
-- 
cgit v1.1