aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorTeravus Ovares (Dan Olivares)2009-10-16 21:24:08 -0400
committerTeravus Ovares (Dan Olivares)2009-10-16 21:24:08 -0400
commit01051daaab27cf4c4b5e3d5e8066caa61cf769a6 (patch)
tree7f7a3a8a05a486f69e35471478cadd143da126f9 /OpenSim
parent* After seeing it repeat over and over again.. again, We won't inform the s... (diff)
downloadopensim-SC_OLD-01051daaab27cf4c4b5e3d5e8066caa61cf769a6.zip
opensim-SC_OLD-01051daaab27cf4c4b5e3d5e8066caa61cf769a6.tar.gz
opensim-SC_OLD-01051daaab27cf4c4b5e3d5e8066caa61cf769a6.tar.bz2
opensim-SC_OLD-01051daaab27cf4c4b5e3d5e8066caa61cf769a6.tar.xz
* One more tweak to inform the user that they may not be able to move until relogging.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs8
-rw-r--r--OpenSim/Region/Physics/OdePlugin/ODECharacter.cs2
2 files changed, 6 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index b468dde..c25fa55 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -3419,10 +3419,12 @@ namespace OpenSim.Region.Framework.Scenes
3419 3419
3420 private void OutOfBoundsCall(PhysicsVector pos) 3420 private void OutOfBoundsCall(PhysicsVector pos)
3421 { 3421 {
3422 bool flying = m_physicsActor.Flying; 3422 //bool flying = m_physicsActor.Flying;
3423 RemoveFromPhysicalScene(); 3423 //RemoveFromPhysicalScene();
3424 3424
3425 AddToPhysicalScene(flying); 3425 //AddToPhysicalScene(flying);
3426 if (ControllingClient != null)
3427 ControllingClient.SendAgentAlertMessage("Physics is having a problem with your avatar. You may not be able to move until you relog.",true);
3426 } 3428 }
3427 3429
3428 // Event called by the physics plugin to tell the avatar about a collision. 3430 // Event called by the physics plugin to tell the avatar about a collision.
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
index 8002eb2..1fff846 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
@@ -1114,7 +1114,7 @@ namespace OpenSim.Region.Physics.OdePlugin
1114 { 1114 {
1115 _parent_scene.BadCharacter(this); 1115 _parent_scene.BadCharacter(this);
1116 vec = new d.Vector3(_position.X, _position.Y, _position.Z); 1116 vec = new d.Vector3(_position.X, _position.Y, _position.Z);
1117 //base.RaiseOutOfBounds(_position); // Tells ScenePresence that there's a problem! 1117 base.RaiseOutOfBounds(_position); // Tells ScenePresence that there's a problem!
1118 m_log.WarnFormat("[ODEPLUGIN]: Avatar Null reference for Avatar: {0}", m_name); 1118 m_log.WarnFormat("[ODEPLUGIN]: Avatar Null reference for Avatar: {0}", m_name);
1119 } 1119 }
1120 1120