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

Don't try to write region size and MapfileStaticFile Nini settings that are not set up when invoking the RemoteAdmin create region facility. 

Changes by MarcelEdward from http://opensimulator.org/mantis/view.php?id=7497.  Thanks.
inv-download
Justin Clark-Casey (justincc) 2015-03-13 23:30:31 +00:00
parent 441d77b5b6
commit caa0e2a732
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
OpenSim/Framework/RegionInfo.cs
View File

@ -823,12 +823,14 @@ namespace OpenSim.Framework
string location = String.Format("{0},{1}", RegionLocX, RegionLocY); string location = String.Format("{0},{1}", RegionLocX, RegionLocY);
config.Set("Location", location); config.Set("Location", location);
if (RegionSizeX != Constants.RegionSize || RegionSizeY != Constants.RegionSize) if (RegionSizeX > 0)
{
config.Set("SizeX", RegionSizeX); config.Set("SizeX", RegionSizeX);
if (RegionSizeY > 0)
config.Set("SizeY", RegionSizeY); config.Set("SizeY", RegionSizeY);
// if (RegionSizeZ > 0)
// config.Set("SizeZ", RegionSizeZ); // config.Set("SizeZ", RegionSizeZ);
}
config.Set("InternalAddress", m_internalEndPoint.Address.ToString()); config.Set("InternalAddress", m_internalEndPoint.Address.ToString());
config.Set("InternalPort", m_internalEndPoint.Port); config.Set("InternalPort", m_internalEndPoint.Port);
@ -872,7 +874,7 @@ namespace OpenSim.Framework
if (m_maptileStaticUUID != UUID.Zero) if (m_maptileStaticUUID != UUID.Zero)
config.Set("MaptileStaticUUID", m_maptileStaticUUID.ToString()); config.Set("MaptileStaticUUID", m_maptileStaticUUID.ToString());
if (MaptileStaticFile != String.Empty) if (MaptileStaticFile != null && MaptileStaticFile != String.Empty)
config.Set("MaptileStaticFile", MaptileStaticFile); config.Set("MaptileStaticFile", MaptileStaticFile);
} }