OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix odd drawdistance control initialization

avinationmerge
UbitUmarov 2015-09-06 16:36:30 +01:00
parent 93b9a92990
commit 3a0137cb45
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@ -274,17 +274,7 @@ namespace OpenSim.Region.Framework.Scenes
protected float m_defaultDrawDistance = 255f; protected float m_defaultDrawDistance = 255f;
public float DefaultDrawDistance public float DefaultDrawDistance
{ {
// get { return m_defaultDrawDistance; } get { return m_defaultDrawDistance; }
get
{
if (RegionInfo != null)
{
float largestDimension = Math.Max(RegionInfo.RegionSizeX, RegionInfo.RegionSizeY);
m_defaultDrawDistance = Math.Max(m_defaultDrawDistance, largestDimension);
}
return m_defaultDrawDistance;
}
} }
protected float m_maxDrawDistance = 512.0f; protected float m_maxDrawDistance = 512.0f;
@ -981,7 +971,11 @@ namespace OpenSim.Region.Framework.Scenes
StartDisabled = startupConfig.GetBoolean("StartDisabled", false); StartDisabled = startupConfig.GetBoolean("StartDisabled", false);
m_defaultDrawDistance = startupConfig.GetFloat("DefaultDrawDistance", m_defaultDrawDistance); m_defaultDrawDistance = startupConfig.GetFloat("DefaultDrawDistance", m_defaultDrawDistance);
m_defaultDrawDistance = startupConfig.GetFloat("MaxDrawDistance", m_maxDrawDistance); m_maxDrawDistance = startupConfig.GetFloat("MaxDrawDistance", m_maxDrawDistance);
if (m_defaultDrawDistance > m_maxDrawDistance)
m_defaultDrawDistance = m_maxDrawDistance;
UseBackup = startupConfig.GetBoolean("UseSceneBackup", UseBackup); UseBackup = startupConfig.GetBoolean("UseSceneBackup", UseBackup);
if (!UseBackup) if (!UseBackup)
m_log.InfoFormat("[SCENE]: Backup has been disabled for {0}", RegionInfo.RegionName); m_log.InfoFormat("[SCENE]: Backup has been disabled for {0}", RegionInfo.RegionName);