diff options
| author | Mic Bowman | 2011-01-05 15:01:53 -0800 |
|---|---|---|
| committer | Mic Bowman | 2011-01-05 15:01:53 -0800 |
| commit | d3ebf64369253593f190fd3b2668ef6958beeb23 (patch) | |
| tree | 7db44ce4a4e6145471c0f1e039f664f3131310d9 /OpenSim/Region/Framework | |
| parent | comment out a couple simian debug messages (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-d3ebf64369253593f190fd3b2668ef6958beeb23.zip opensim-SC_OLD-d3ebf64369253593f190fd3b2668ef6958beeb23.tar.gz opensim-SC_OLD-d3ebf64369253593f190fd3b2668ef6958beeb23.tar.bz2 opensim-SC_OLD-d3ebf64369253593f190fd3b2668ef6958beeb23.tar.xz | |
Merge branch 'master' into cmickeyb
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..3a40196 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 (Animator != null) |
| 2503 | Animator.SendAnimPackToClient(avatar.ControllingClient); | ||
| 2503 | } | 2504 | } |
| 2504 | 2505 | ||
| 2505 | /// <summary> | 2506 | /// <summary> |