diff options
| author | Melanie | 2011-01-06 19:08:15 +0000 |
|---|---|---|
| committer | Melanie | 2011-01-06 19:08:15 +0000 |
| commit | de4eaab5847b6c4c5eb4c8c07191b8c463d0b3ad (patch) | |
| tree | 7b9865d97acfd441edb97d12ce8286eb48901cee /OpenSim/Region/Framework/Scenes | |
| parent | Fix god mode perms adjustment (diff) | |
| parent | Merge branch 'master' into cmickeyb (diff) | |
| download | opensim-SC_OLD-de4eaab5847b6c4c5eb4c8c07191b8c463d0b3ad.zip opensim-SC_OLD-de4eaab5847b6c4c5eb4c8c07191b8c463d0b3ad.tar.gz opensim-SC_OLD-de4eaab5847b6c4c5eb4c8c07191b8c463d0b3ad.tar.bz2 opensim-SC_OLD-de4eaab5847b6c4c5eb4c8c07191b8c463d0b3ad.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
| -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 208c2a6..b8ad3ca 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -2858,7 +2858,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 2858 | // m_log.WarnFormat("[SP] Send avatar data from {0} to {1}",m_uuid,avatar.ControllingClient.AgentId); | 2858 | // m_log.WarnFormat("[SP] Send avatar data from {0} to {1}",m_uuid,avatar.ControllingClient.AgentId); |
| 2859 | 2859 | ||
| 2860 | avatar.ControllingClient.SendAvatarDataImmediate(this); | 2860 | avatar.ControllingClient.SendAvatarDataImmediate(this); |
| 2861 | Animator.SendAnimPackToClient(avatar.ControllingClient); | 2861 | if (Animator != null) |
| 2862 | Animator.SendAnimPackToClient(avatar.ControllingClient); | ||
| 2862 | } | 2863 | } |
| 2863 | 2864 | ||
| 2864 | /// <summary> | 2865 | /// <summary> |