aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.cs
diff options
context:
space:
mode:
authorUbitUmarov2015-12-23 21:22:00 +0000
committerUbitUmarov2015-12-23 21:22:00 +0000
commit24aa5297155a47a57ad53841fea3eae759235c7b (patch)
tree07add88889ea1d223eae90a7e34ffad607a3fee7 /OpenSim/Region/Framework/Scenes/Scene.cs
parent physics landing: don't land on top of volume detectors (diff)
downloadopensim-SC_OLD-24aa5297155a47a57ad53841fea3eae759235c7b.zip
opensim-SC_OLD-24aa5297155a47a57ad53841fea3eae759235c7b.tar.gz
opensim-SC_OLD-24aa5297155a47a57ad53841fea3eae759235c7b.tar.bz2
opensim-SC_OLD-24aa5297155a47a57ad53841fea3eae759235c7b.tar.xz
fix avatar movetotarget that got broken with changes on significant movement. Do it all on scenepresence.cs, and not also on scene.cs. check distance to target only on X,Y if not flying or landing
Diffstat (limited to '')
-rwxr-xr-xOpenSim/Region/Framework/Scenes/Scene.cs5
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index a7e06a8..5799cd4 100755
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1309,7 +1309,7 @@ namespace OpenSim.Region.Framework.Scenes
1309 1309
1310 protected virtual void RegisterDefaultSceneEvents() 1310 protected virtual void RegisterDefaultSceneEvents()
1311 { 1311 {
1312 m_eventManager.OnSignificantClientMovement += HandleOnSignificantClientMovement; 1312// m_eventManager.OnSignificantClientMovement += HandleOnSignificantClientMovement;
1313 } 1313 }
1314 1314
1315 public override string GetSimulatorVersion() 1315 public override string GetSimulatorVersion()
@@ -6334,6 +6334,7 @@ Environment.Exit(1);
6334 /// This is not intended as a permament location for this method. 6334 /// This is not intended as a permament location for this method.
6335 /// </remarks> 6335 /// </remarks>
6336 /// <param name="presence"></param> 6336 /// <param name="presence"></param>
6337/* move to target is now done on presence update
6337 private void HandleOnSignificantClientMovement(ScenePresence presence) 6338 private void HandleOnSignificantClientMovement(ScenePresence presence)
6338 { 6339 {
6339 if (presence.MovingToTarget) 6340 if (presence.MovingToTarget)
@@ -6390,7 +6391,7 @@ Environment.Exit(1);
6390 } 6391 }
6391 } 6392 }
6392 } 6393 }
6393 6394*/
6394 // manage and select spawn points in sequence 6395 // manage and select spawn points in sequence
6395 public int SpawnPoint() 6396 public int SpawnPoint()
6396 { 6397 {