aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs14
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs11
2 files changed, 13 insertions, 12 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>
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index b93b67d..c517978 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1293,11 +1293,11 @@ namespace OpenSim.Region.Framework.Scenes
1293// "[SCENE PRESENCE]: In {0} received agent update from {1}", 1293// "[SCENE PRESENCE]: In {0} received agent update from {1}",
1294// Scene.RegionInfo.RegionName, remoteClient.Name); 1294// Scene.RegionInfo.RegionName, remoteClient.Name);
1295 1295
1296 //if (IsChildAgent) 1296 if (IsChildAgent)
1297 //{ 1297 {
1298 // // m_log.Debug("DEBUG: HandleAgentUpdate: child agent"); 1298 // // m_log.Debug("DEBUG: HandleAgentUpdate: child agent");
1299 // return; 1299 return;
1300 //} 1300 }
1301 1301
1302 ++m_movementUpdateCount; 1302 ++m_movementUpdateCount;
1303 if (m_movementUpdateCount < 1) 1303 if (m_movementUpdateCount < 1)
@@ -3280,6 +3280,9 @@ namespace OpenSim.Region.Framework.Scenes
3280 // Event called by the physics plugin to tell the avatar about a collision. 3280 // Event called by the physics plugin to tell the avatar about a collision.
3281 private void PhysicsCollisionUpdate(EventArgs e) 3281 private void PhysicsCollisionUpdate(EventArgs e)
3282 { 3282 {
3283 if (IsChildAgent)
3284 return;
3285
3283 //if ((Math.Abs(Velocity.X) > 0.1e-9f) || (Math.Abs(Velocity.Y) > 0.1e-9f)) 3286 //if ((Math.Abs(Velocity.X) > 0.1e-9f) || (Math.Abs(Velocity.Y) > 0.1e-9f))
3284 // The Physics Scene will send updates every 500 ms grep: PhysicsActor.SubscribeEvents( 3287 // The Physics Scene will send updates every 500 ms grep: PhysicsActor.SubscribeEvents(
3285 // as of this comment the interval is set in AddToPhysicalScene 3288 // as of this comment the interval is set in AddToPhysicalScene