diff options
author | Justin Clark-Casey (justincc) | 2011-12-03 00:09:18 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-12-03 00:09:18 +0000 |
commit | 96c191f4fdbd64009fc210b8c911c832723bb10e (patch) | |
tree | a5e60449f5e7c41b4849fb5190468af762da2c2f /OpenSim/Region/Framework/Scenes/Animation | |
parent | Stop some places where we're trying to reset animations in child agents where... (diff) | |
download | opensim-SC_OLD-96c191f4fdbd64009fc210b8c911c832723bb10e.zip opensim-SC_OLD-96c191f4fdbd64009fc210b8c911c832723bb10e.tar.gz opensim-SC_OLD-96c191f4fdbd64009fc210b8c911c832723bb10e.tar.bz2 opensim-SC_OLD-96c191f4fdbd64009fc210b8c911c832723bb10e.tar.xz |
Stop SP.HandleAgentUpdate() and PhysicsCollisionUpdate() from being processed if we're dealing with a child ScenePresence.
Neither of these can have any effect on child agents
Now leaving warning about trying to set animation on a child agent active. Might temporarily pop up now and again.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Animation')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs index 6b1208c..a2805d2 100644 --- a/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs +++ b/OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs | |||
@@ -158,14 +158,12 @@ namespace OpenSim.Region.Framework.Scenes.Animation | |||
158 | SendAnimPack(); | 158 | SendAnimPack(); |
159 | } | 159 | } |
160 | } | 160 | } |
161 | // Don't leave this on since on teleports SP.HandleAgentUpdate() still hammers us for a while after it teleports | 161 | else |
162 | // else | 162 | { |
163 | // { | 163 | m_log.WarnFormat( |
164 | // m_log.WarnFormat( | 164 | "[SCENE PRESENCE ANIMATOR]: Tried to set movement animation {0} on child presence {1}", |
165 | // "[SCENE PRESENCE ANIMATOR]: Tried to set movement animation {0} on child presence {1}", | 165 | anim, m_scenePresence.Name); |
166 | // anim, m_scenePresence.Name); | 166 | } |
167 | // throw new Exception(string.Format("aaargh on setting {0}", anim)); | ||
168 | // } | ||
169 | } | 167 | } |
170 | 168 | ||
171 | /// <summary> | 169 | /// <summary> |