diff options
| author | John Hurliman | 2009-10-16 18:32:12 -0700 |
|---|---|---|
| committer | John Hurliman | 2009-10-16 18:32:12 -0700 |
| commit | 9c21d672d4d2160e89282d8b964e8131c247e467 (patch) | |
| tree | ad516c5afde02c443d592fcfb9d8fea1b73f6926 | |
| parent | Changing avatar movement updates to the Task throttle category until we get f... (diff) | |
| parent | * One more tweak to inform the user that they may not be able to move until r... (diff) | |
| download | opensim-SC-9c21d672d4d2160e89282d8b964e8131c247e467.zip opensim-SC-9c21d672d4d2160e89282d8b964e8131c247e467.tar.gz opensim-SC-9c21d672d4d2160e89282d8b964e8131c247e467.tar.bz2 opensim-SC-9c21d672d4d2160e89282d8b964e8131c247e467.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into prioritization
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 973537e..9d13ad4 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -3412,10 +3412,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 3412 | 3412 | ||
| 3413 | private void OutOfBoundsCall(PhysicsVector pos) | 3413 | private void OutOfBoundsCall(PhysicsVector pos) |
| 3414 | { | 3414 | { |
| 3415 | bool flying = m_physicsActor.Flying; | 3415 | //bool flying = m_physicsActor.Flying; |
| 3416 | RemoveFromPhysicalScene(); | 3416 | //RemoveFromPhysicalScene(); |
| 3417 | 3417 | ||
| 3418 | AddToPhysicalScene(flying); | 3418 | //AddToPhysicalScene(flying); |
| 3419 | if (ControllingClient != null) | ||
| 3420 | ControllingClient.SendAgentAlertMessage("Physics is having a problem with your avatar. You may not be able to move until you relog.",true); | ||
| 3419 | } | 3421 | } |
| 3420 | 3422 | ||
| 3421 | // Event called by the physics plugin to tell the avatar about a collision. | 3423 | // Event called by the physics plugin to tell the avatar about a collision. |