diff options
| author | Diva Canto | 2011-01-04 11:30:08 -0800 |
|---|---|---|
| committer | Diva Canto | 2011-01-04 11:30:08 -0800 |
| commit | db558591259587bbf79c2358350385e0bbb5d286 (patch) | |
| tree | a88d0d0d75f9c551bc807db76abe32dbe65f091d /OpenSim/Region/Framework | |
| parent | Add permissions hooks for object transfers (diff) | |
| download | opensim-SC-db558591259587bbf79c2358350385e0bbb5d286.zip opensim-SC-db558591259587bbf79c2358350385e0bbb5d286.tar.gz opensim-SC-db558591259587bbf79c2358350385e0bbb5d286.tar.bz2 opensim-SC-db558591259587bbf79c2358350385e0bbb5d286.tar.xz | |
Guard against null Animator.
Diffstat (limited to 'OpenSim/Region/Framework')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 3 |
1 files changed, 2 insertions, 1 deletions
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 | |||
| 2499 | // m_log.WarnFormat("[SP] Send avatar data from {0} to {1}",m_uuid,avatar.ControllingClient.AgentId); | 2499 | // m_log.WarnFormat("[SP] Send avatar data from {0} to {1}",m_uuid,avatar.ControllingClient.AgentId); |
| 2500 | 2500 | ||
| 2501 | avatar.ControllingClient.SendAvatarDataImmediate(this); | 2501 | avatar.ControllingClient.SendAvatarDataImmediate(this); |
| 2502 | Animator.SendAnimPackToClient(avatar.ControllingClient); | 2502 | if (Animation != null) |
| 2503 | Animator.SendAnimPackToClient(avatar.ControllingClient); | ||
| 2503 | } | 2504 | } |
| 2504 | 2505 | ||
| 2505 | /// <summary> | 2506 | /// <summary> |