aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorteravus2013-02-16 22:54:37 -0500
committerteravus2013-02-16 22:54:37 -0500
commit6560d80fa856fb73c51a7ccd37f720c25b12d42d (patch)
treefee19ed9326e2cf16d4d769748891741c3ea2801
parentBulletSim: fix physical object appearing to slowly float off when (diff)
downloadopensim-SC_OLD-6560d80fa856fb73c51a7ccd37f720c25b12d42d.zip
opensim-SC_OLD-6560d80fa856fb73c51a7ccd37f720c25b12d42d.tar.gz
opensim-SC_OLD-6560d80fa856fb73c51a7ccd37f720c25b12d42d.tar.bz2
opensim-SC_OLD-6560d80fa856fb73c51a7ccd37f720c25b12d42d.tar.xz
* Fix walking to <NaN, NaN, NaN> via autopilot.
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs6
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 70e3952..9c1d2b6 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1847,7 +1847,11 @@ namespace OpenSim.Region.Framework.Scenes
1847 // Get terrain height for sub-region in a megaregion if necessary 1847 // Get terrain height for sub-region in a megaregion if necessary
1848 int X = (int)((m_scene.RegionInfo.RegionLocX * Constants.RegionSize) + pos.X); 1848 int X = (int)((m_scene.RegionInfo.RegionLocX * Constants.RegionSize) + pos.X);
1849 int Y = (int)((m_scene.RegionInfo.RegionLocY * Constants.RegionSize) + pos.Y); 1849 int Y = (int)((m_scene.RegionInfo.RegionLocY * Constants.RegionSize) + pos.Y);
1850 UUID target_regionID = m_scene.GridService.GetRegionByPosition(m_scene.RegionInfo.ScopeID, X, Y).RegionID; 1850 GridRegion target_region = m_scene.GridService.GetRegionByPosition(m_scene.RegionInfo.ScopeID, X, Y);
1851 // If X and Y is NaN, target_region will be null
1852 if (target_region == null)
1853 return;
1854 UUID target_regionID = target_region.RegionID;
1851 Scene targetScene = m_scene; 1855 Scene targetScene = m_scene;
1852 1856
1853 if (!SceneManager.Instance.TryGetScene(target_regionID, out targetScene)) 1857 if (!SceneManager.Instance.TryGetScene(target_regionID, out targetScene))