diff options
| author | Melanie | 2012-09-04 22:53:52 +0200 |
|---|---|---|
| committer | Melanie | 2012-09-04 22:53:52 +0200 |
| commit | 9ae293881addf98844b8f292298bc0674ebbed0d (patch) | |
| tree | a3ce8a6bcb133c964f0b115094c1abef1e5c5cc3 /OpenSim/Region | |
| parent | Merge branch 'ubitwork' into avination (diff) | |
| download | opensim-SC_OLD-9ae293881addf98844b8f292298bc0674ebbed0d.zip opensim-SC_OLD-9ae293881addf98844b8f292298bc0674ebbed0d.tar.gz opensim-SC_OLD-9ae293881addf98844b8f292298bc0674ebbed0d.tar.bz2 opensim-SC_OLD-9ae293881addf98844b8f292298bc0674ebbed0d.tar.xz | |
Make friend notifies and closing child agents async because both can
block the heartbeat thread if the sim being contacted is unresponsive
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 34ac7d4..433efc7 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -3432,7 +3432,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 3432 | /// <param name="e"></param> | 3432 | /// <param name="e"></param> |
| 3433 | public void PhysicsCollisionUpdate(EventArgs e) | 3433 | public void PhysicsCollisionUpdate(EventArgs e) |
| 3434 | { | 3434 | { |
| 3435 | if (IsChildAgent) | 3435 | if (IsChildAgent || Animator == null) |
| 3436 | return; | 3436 | return; |
| 3437 | 3437 | ||
| 3438 | //if ((Math.Abs(Velocity.X) > 0.1e-9f) || (Math.Abs(Velocity.Y) > 0.1e-9f)) | 3438 | //if ((Math.Abs(Velocity.X) > 0.1e-9f) || (Math.Abs(Velocity.Y) > 0.1e-9f)) |