aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/RegionLoader
diff options
context:
space:
mode:
authormingchen2008-01-04 14:14:15 +0000
committermingchen2008-01-04 14:14:15 +0000
commit81b4c7be3e84b29e5fcc387f578afdc07b806048 (patch)
tree5e835924288eb49fb92d293133ee68ae728d7f60 /OpenSim/Framework/RegionLoader
parent* Fixed situation where sometimes your avatar tries to land and gets 'put' 80... (diff)
downloadopensim-SC_OLD-81b4c7be3e84b29e5fcc387f578afdc07b806048.zip
opensim-SC_OLD-81b4c7be3e84b29e5fcc387f578afdc07b806048.tar.gz
opensim-SC_OLD-81b4c7be3e84b29e5fcc387f578afdc07b806048.tar.bz2
opensim-SC_OLD-81b4c7be3e84b29e5fcc387f578afdc07b806048.tar.xz
*Added ability to skip any use of the console when configuring and assume default value. This is useful when the server is running by itself and a new region request is added without sufficient information
Diffstat (limited to 'OpenSim/Framework/RegionLoader')
-rw-r--r--OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs4
-rw-r--r--OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs2
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs b/OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs
index a710f50..66a6ec8 100644
--- a/OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs
+++ b/OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs
@@ -49,14 +49,14 @@ namespace OpenSim.Framework.RegionLoader.Filesystem
49 49
50 if (configFiles.Length == 0) 50 if (configFiles.Length == 0)
51 { 51 {
52 new RegionInfo("DEFAULT REGION CONFIG", Path.Combine(regionConfigPath, "default.xml")); 52 new RegionInfo("DEFAULT REGION CONFIG", Path.Combine(regionConfigPath, "default.xml"),false);
53 configFiles = Directory.GetFiles(regionConfigPath, "*.xml"); 53 configFiles = Directory.GetFiles(regionConfigPath, "*.xml");
54 } 54 }
55 55
56 RegionInfo[] regionInfos = new RegionInfo[configFiles.Length]; 56 RegionInfo[] regionInfos = new RegionInfo[configFiles.Length];
57 for (int i = 0; i < configFiles.Length; i++) 57 for (int i = 0; i < configFiles.Length; i++)
58 { 58 {
59 RegionInfo regionInfo = new RegionInfo("REGION CONFIG #" + (i + 1), configFiles[i]); 59 RegionInfo regionInfo = new RegionInfo("REGION CONFIG #" + (i + 1), configFiles[i],false);
60 regionInfos[i] = regionInfo; 60 regionInfos[i] = regionInfo;
61 } 61 }
62 62
diff --git a/OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs b/OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs
index 1625fa6..80acbae 100644
--- a/OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs
+++ b/OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs
@@ -86,7 +86,7 @@ namespace OpenSim.Framework.RegionLoader.Web
86 { 86 {
87 MainLog.Instance.Debug(xmlDoc.FirstChild.ChildNodes[i].OuterXml); 87 MainLog.Instance.Debug(xmlDoc.FirstChild.ChildNodes[i].OuterXml);
88 regionInfos[i] = 88 regionInfos[i] =
89 new RegionInfo("REGION CONFIG #" + (i + 1), xmlDoc.FirstChild.ChildNodes[i]); 89 new RegionInfo("REGION CONFIG #" + (i + 1), xmlDoc.FirstChild.ChildNodes[i],false);
90 } 90 }
91 91
92 return regionInfos; 92 return regionInfos;