From 0f03c64a0c2f5b7fd5bc38d86e2492f4acebc924 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Sun, 23 Feb 2014 21:56:37 -0800
Subject: Make Scene.DefaultDrawDistance to be the max of the region size and
 the user setting. Seems this parameter has many side effects.

---
 OpenSim/Region/Framework/Scenes/Scene.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region/Framework/Scenes')

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 676c000..f7fd767 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -217,7 +217,9 @@ namespace OpenSim.Region.Framework.Scenes
             get {
                 if (RegionInfo != null)
                 {
-                    m_defaultDrawDistance = Math.Max(RegionInfo.RegionSizeX, RegionInfo.RegionSizeY);
+                    float largestDimension = Math.Max(RegionInfo.RegionSizeX, RegionInfo.RegionSizeY);
+                    m_defaultDrawDistance = Math.Max(m_defaultDrawDistance, largestDimension);
+
                 }
                 return m_defaultDrawDistance;
             }
-- 
cgit v1.1