aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2015-03-13 23:30:31 +0000
committerJustin Clark-Casey (justincc)2015-03-13 23:30:31 +0000
commitcaa0e2a73211239fe9bade7f08bc8570168ef642 (patch)
treea02004d1784695234ea1d0fe53129fbf81519ba2 /OpenSim/Framework
parentFor the public-facing Hypergrid asset and inventory services, override a gene... (diff)
downloadopensim-SC_OLD-caa0e2a73211239fe9bade7f08bc8570168ef642.zip
opensim-SC_OLD-caa0e2a73211239fe9bade7f08bc8570168ef642.tar.gz
opensim-SC_OLD-caa0e2a73211239fe9bade7f08bc8570168ef642.tar.bz2
opensim-SC_OLD-caa0e2a73211239fe9bade7f08bc8570168ef642.tar.xz
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.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/RegionInfo.cs10
1 files changed, 6 insertions, 4 deletions
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index 4169152..79fbd96 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -823,12 +823,14 @@ namespace OpenSim.Framework
823 string location = String.Format("{0},{1}", RegionLocX, RegionLocY); 823 string location = String.Format("{0},{1}", RegionLocX, RegionLocY);
824 config.Set("Location", location); 824 config.Set("Location", location);
825 825
826 if (RegionSizeX != Constants.RegionSize || RegionSizeY != Constants.RegionSize) 826 if (RegionSizeX > 0)
827 {
828 config.Set("SizeX", RegionSizeX); 827 config.Set("SizeX", RegionSizeX);
828
829 if (RegionSizeY > 0)
829 config.Set("SizeY", RegionSizeY); 830 config.Set("SizeY", RegionSizeY);
831
832// if (RegionSizeZ > 0)
830// config.Set("SizeZ", RegionSizeZ); 833// config.Set("SizeZ", RegionSizeZ);
831 }
832 834
833 config.Set("InternalAddress", m_internalEndPoint.Address.ToString()); 835 config.Set("InternalAddress", m_internalEndPoint.Address.ToString());
834 config.Set("InternalPort", m_internalEndPoint.Port); 836 config.Set("InternalPort", m_internalEndPoint.Port);
@@ -872,7 +874,7 @@ namespace OpenSim.Framework
872 if (m_maptileStaticUUID != UUID.Zero) 874 if (m_maptileStaticUUID != UUID.Zero)
873 config.Set("MaptileStaticUUID", m_maptileStaticUUID.ToString()); 875 config.Set("MaptileStaticUUID", m_maptileStaticUUID.ToString());
874 876
875 if (MaptileStaticFile != String.Empty) 877 if (MaptileStaticFile != null && MaptileStaticFile != String.Empty)
876 config.Set("MaptileStaticFile", MaptileStaticFile); 878 config.Set("MaptileStaticFile", MaptileStaticFile);
877 } 879 }
878 880