Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into prioritization

prioritization
John Hurliman 2009-10-16 18:32:12 -07:00
commit 9c21d672d4
1 changed files with 5 additions and 3 deletions

View File

@ -3412,10 +3412,12 @@ namespace OpenSim.Region.Framework.Scenes
private void OutOfBoundsCall(PhysicsVector pos) private void OutOfBoundsCall(PhysicsVector pos)
{ {
bool flying = m_physicsActor.Flying; //bool flying = m_physicsActor.Flying;
RemoveFromPhysicalScene(); //RemoveFromPhysicalScene();
AddToPhysicalScene(flying); //AddToPhysicalScene(flying);
if (ControllingClient != null)
ControllingClient.SendAgentAlertMessage("Physics is having a problem with your avatar. You may not be able to move until you relog.",true);
} }
// Event called by the physics plugin to tell the avatar about a collision. // Event called by the physics plugin to tell the avatar about a collision.