diff options
author | Melanie Thielker | 2010-07-17 02:46:04 +0200 |
---|---|---|
committer | Melanie Thielker | 2010-07-17 02:46:04 +0200 |
commit | d1040c9ff9b47b143e456d06801bd6be148bb1b9 (patch) | |
tree | 35433df5332b03400c83e1de780005cc609dd521 | |
parent | Make webloading more robust by addign retries (diff) | |
download | opensim-SC_OLD-d1040c9ff9b47b143e456d06801bd6be148bb1b9.zip opensim-SC_OLD-d1040c9ff9b47b143e456d06801bd6be148bb1b9.tar.gz opensim-SC_OLD-d1040c9ff9b47b143e456d06801bd6be148bb1b9.tar.bz2 opensim-SC_OLD-d1040c9ff9b47b143e456d06801bd6be148bb1b9.tar.xz |
Replace the screenful of code i deleted.
-rw-r--r-- | OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs b/OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs index dd224cd..f0ffc2c 100644 --- a/OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs +++ b/OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs | |||
@@ -82,6 +82,25 @@ namespace OpenSim.Framework.RegionLoader.Web | |||
82 | xmlSource = xmlSource + tempStr; | 82 | xmlSource = xmlSource + tempStr; |
83 | tempStr = reader.ReadLine(); | 83 | tempStr = reader.ReadLine(); |
84 | } | 84 | } |
85 | m_log.Debug("[WEBLOADER]: Done downloading region information from server. Total Bytes: " + | ||
86 | xmlSource.Length); | ||
87 | XmlDocument xmlDoc = new XmlDocument(); | ||
88 | xmlDoc.LoadXml(xmlSource); | ||
89 | if (xmlDoc.FirstChild.Name == "Regions") | ||
90 | { | ||
91 | RegionInfo[] regionInfos = new RegionInfo[xmlDoc.FirstChild.ChildNodes.Count]; | ||
92 | int i; | ||
93 | for (i = 0; i < xmlDoc.FirstChild.ChildNodes.Count; i++) | ||
94 | { | ||
95 | m_log.Debug(xmlDoc.FirstChild.ChildNodes[i].OuterXml); | ||
96 | regionInfos[i] = | ||
97 | new RegionInfo("REGION CONFIG #" + (i + 1), xmlDoc.FirstChild.ChildNodes[i],false,m_configSource); | ||
98 | } | ||
99 | |||
100 | if (i > 0) | ||
101 | return regionInfos; | ||
102 | } | ||
103 | |||
85 | m_log.Debug("[WEBLOADER]: Request yielded no regions."); | 104 | m_log.Debug("[WEBLOADER]: Request yielded no regions."); |
86 | tries--; | 105 | tries--; |
87 | if (tries > 0) | 106 | if (tries > 0) |