OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* One more tweak to inform the user that they may not be able to move until relogging.

prioritization
Teravus Ovares (Dan Olivares) 2009-10-16 21:24:08 -04:00
parent d49424c421
commit 01051daaab
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@ -3419,10 +3419,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.

2
OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
View File

@ -1114,7 +1114,7 @@ namespace OpenSim.Region.Physics.OdePlugin
{ {
_parent_scene.BadCharacter(this); _parent_scene.BadCharacter(this);
vec = new d.Vector3(_position.X, _position.Y, _position.Z); vec = new d.Vector3(_position.X, _position.Y, _position.Z);
//base.RaiseOutOfBounds(_position); // Tells ScenePresence that there's a problem! base.RaiseOutOfBounds(_position); // Tells ScenePresence that there's a problem!
m_log.WarnFormat("[ODEPLUGIN]: Avatar Null reference for Avatar: {0}", m_name); m_log.WarnFormat("[ODEPLUGIN]: Avatar Null reference for Avatar: {0}", m_name);
} }