diff options
Merge branch 'master' of /home/opensim/var/repo/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs index 4cf854e..6b1208c 100644 --- a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs +++ b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs | |||
@@ -131,8 +131,11 @@ namespace OpenSim.Region.Framework.Scenes.Animation | |||
131 | 131 | ||
132 | public void ResetAnimations() | 132 | public void ResetAnimations() |
133 | { | 133 | { |
134 | // m_log.DebugFormat( | ||
135 | // "[SCENE PRESENCE ANIMATOR]: Resetting animations for {0} in {1}", | ||
136 | // m_scenePresence.Name, m_scenePresence.Scene.RegionInfo.RegionName); | ||
137 | |||
134 | m_animations.Clear(); | 138 | m_animations.Clear(); |
135 | TrySetMovementAnimation("STAND"); | ||
136 | } | 139 | } |
137 | 140 | ||
138 | /// <summary> | 141 | /// <summary> |
@@ -155,6 +158,14 @@ namespace OpenSim.Region.Framework.Scenes.Animation | |||
155 | SendAnimPack(); | 158 | SendAnimPack(); |
156 | } | 159 | } |
157 | } | 160 | } |
161 | // Don't leave this on since on teleports SP.HandleAgentUpdate() still hammers us for a while after it teleports | ||
162 | // else | ||
163 | // { | ||
164 | // m_log.WarnFormat( | ||
165 | // "[SCENE PRESENCE ANIMATOR]: Tried to set movement animation {0} on child presence {1}", | ||
166 | // anim, m_scenePresence.Name); | ||
167 | // throw new Exception(string.Format("aaargh on setting {0}", anim)); | ||
168 | // } | ||
158 | } | 169 | } |
159 | 170 | ||
160 | /// <summary> | 171 | /// <summary> |