aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes
diff options
context:
space:
mode:
authorTeravus Ovares2008-02-18 20:39:16 +0000
committerTeravus Ovares2008-02-18 20:39:16 +0000
commit056f3dca2c74cfa00fed11f62b74b0a344ecce37 (patch)
treeafa414defd4ed303e7429da384f937cbf0eab375 /OpenSim/Region/Environment/Scenes
parent* Output XmlRpc error message if user server gets a fault response from the r... (diff)
downloadopensim-SC_OLD-056f3dca2c74cfa00fed11f62b74b0a344ecce37.zip
opensim-SC_OLD-056f3dca2c74cfa00fed11f62b74b0a344ecce37.tar.gz
opensim-SC_OLD-056f3dca2c74cfa00fed11f62b74b0a344ecce37.tar.bz2
opensim-SC_OLD-056f3dca2c74cfa00fed11f62b74b0a344ecce37.tar.xz
* Probably fixed the corner freeze bug. On uninitialized avatar, ODEPlugin was trying to set the height of avatar to 127m, which you can imagine is a bit /wrong\
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs12
1 files changed, 9 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 8e5907c..1767623 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -1742,12 +1742,18 @@ namespace OpenSim.Region.Environment.Scenes
1742 public void AddToPhysicalScene() 1742 public void AddToPhysicalScene()
1743 { 1743 {
1744 PhysicsScene scene = m_scene.PhysicsScene; 1744 PhysicsScene scene = m_scene.PhysicsScene;
1745 1745
1746 PhysicsVector pVec = 1746 PhysicsVector pVec =
1747 new PhysicsVector(AbsolutePosition.X, AbsolutePosition.Y, 1747 new PhysicsVector(AbsolutePosition.X, AbsolutePosition.Y,
1748 AbsolutePosition.Z); 1748 AbsolutePosition.Z);
1749 1749 if (m_avHeight == 127.0f)
1750 m_physicsActor = scene.AddAvatar(Firstname + "." + Lastname, pVec,new PhysicsVector(0,0,m_avHeight)); 1750 {
1751 m_physicsActor = scene.AddAvatar(Firstname + "." + Lastname, pVec, new PhysicsVector(0, 0, 1.56f));
1752 }
1753 else
1754 {
1755 m_physicsActor = scene.AddAvatar(Firstname + "." + Lastname, pVec, new PhysicsVector(0, 0, m_avHeight));
1756 }
1751 //m_physicsActor.OnRequestTerseUpdate += SendTerseUpdateToAllClients; 1757 //m_physicsActor.OnRequestTerseUpdate += SendTerseUpdateToAllClients;
1752 m_physicsActor.OnCollisionUpdate += PhysicsCollisionUpdate; 1758 m_physicsActor.OnCollisionUpdate += PhysicsCollisionUpdate;
1753 } 1759 }