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/ScenePresence.cs | |
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/ScenePresence.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 11 |
1 files changed, 7 insertions, 4 deletions
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 |