aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/Scene.cs
diff options
context:
space:
mode:
authordan miller2007-09-21 02:31:36 +0000
committerdan miller2007-09-21 02:31:36 +0000
commitd3050724d8fdb0de5b87285b782de9c4d2f9bac7 (patch)
tree2d7f2fa65b1e4dcf70b6d7c52a3336a4148d0a60 /OpenSim/Region/Environment/Scenes/Scene.cs
parent* Removed Unused 'Entity' superclass (diff)
downloadopensim-SC_OLD-d3050724d8fdb0de5b87285b782de9c4d2f9bac7.zip
opensim-SC_OLD-d3050724d8fdb0de5b87285b782de9c4d2f9bac7.tar.gz
opensim-SC_OLD-d3050724d8fdb0de5b87285b782de9c4d2f9bac7.tar.bz2
opensim-SC_OLD-d3050724d8fdb0de5b87285b782de9c4d2f9bac7.tar.xz
physics-related fixes; should stabilize border crossings
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 5b08155..d89ca28 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -833,6 +833,7 @@ namespace OpenSim.Region.Environment.Scenes
833 if (presence.PhysicsActor != null) 833 if (presence.PhysicsActor != null)
834 { 834 {
835 phyScene.RemoveAvatar(presence.PhysicsActor); 835 phyScene.RemoveAvatar(presence.PhysicsActor);
836 presence.PhysicsActor = null;
836 } 837 }
837 }); 838 });
838 839
@@ -1028,7 +1029,7 @@ namespace OpenSim.Region.Environment.Scenes
1028 { 1029 {
1029 if (m_scenePresences.ContainsKey(agentID)) 1030 if (m_scenePresences.ContainsKey(agentID))
1030 { 1031 {
1031 m_scenePresences[agentID].MakeAvatar(position, isFlying); 1032 m_scenePresences[agentID].MakeAvatarPhysical(position, isFlying);
1032 } 1033 }
1033 } 1034 }
1034 } 1035 }