diff options
author | lbsa71 | 2007-12-27 21:41:48 +0000 |
---|---|---|
committer | lbsa71 | 2007-12-27 21:41:48 +0000 |
commit | efd90b56b761219af6425b1c7a2cdd3b6ffb4de2 (patch) | |
tree | bf5b897e1e3c13211e3e2fc61d30508b94c928c0 /OpenSim/Framework/RegionLoader/Web | |
parent | * removed always true if (diff) | |
download | opensim-SC_OLD-efd90b56b761219af6425b1c7a2cdd3b6ffb4de2.zip opensim-SC_OLD-efd90b56b761219af6425b1c7a2cdd3b6ffb4de2.tar.gz opensim-SC_OLD-efd90b56b761219af6425b1c7a2cdd3b6ffb4de2.tar.bz2 opensim-SC_OLD-efd90b56b761219af6425b1c7a2cdd3b6ffb4de2.tar.xz |
* Optimized usings
* shortened references
* Removed redundant 'this'
* Normalized EOF
Diffstat (limited to 'OpenSim/Framework/RegionLoader/Web')
-rw-r--r-- | OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs | 37 |
1 files changed, 19 insertions, 18 deletions
diff --git a/OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs b/OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs index ec7059a..1625fa6 100644 --- a/OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs +++ b/OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs | |||
@@ -25,48 +25,46 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | * | 26 | * |
27 | */ | 27 | */ |
28 | using System; | ||
29 | using System.Net; | ||
30 | using System.IO; | 28 | using System.IO; |
29 | using System.Net; | ||
31 | using System.Xml; | 30 | using System.Xml; |
32 | using System.Collections.Generic; | ||
33 | using System.Text; | ||
34 | using Nini.Config; | 31 | using Nini.Config; |
35 | using OpenSim.Framework; | 32 | using OpenSim.Framework.Console; |
36 | 33 | ||
37 | namespace OpenSim.Framework.RegionLoader.Web | 34 | namespace OpenSim.Framework.RegionLoader.Web |
38 | { | 35 | { |
39 | public class RegionLoaderWebServer : IRegionLoader | 36 | public class RegionLoaderWebServer : IRegionLoader |
40 | { | 37 | { |
41 | private IniConfigSource m_configSouce; | 38 | private IniConfigSource m_configSouce; |
39 | |||
42 | public void SetIniConfigSource(IniConfigSource configSource) | 40 | public void SetIniConfigSource(IniConfigSource configSource) |
43 | { | 41 | { |
44 | m_configSouce = configSource; | 42 | m_configSouce = configSource; |
45 | } | 43 | } |
44 | |||
46 | public RegionInfo[] LoadRegions() | 45 | public RegionInfo[] LoadRegions() |
47 | { | 46 | { |
48 | if (m_configSouce == null) | 47 | if (m_configSouce == null) |
49 | { | 48 | { |
50 | Console.MainLog.Instance.Error("WEBLOADER", "Unable to load configuration source!"); | 49 | MainLog.Instance.Error("WEBLOADER", "Unable to load configuration source!"); |
51 | return null; | 50 | return null; |
52 | } | 51 | } |
53 | else | 52 | else |
54 | { | 53 | { |
55 | IniConfig startupConfig = (IniConfig)m_configSouce.Configs["Startup"]; | 54 | IniConfig startupConfig = (IniConfig) m_configSouce.Configs["Startup"]; |
56 | string url = startupConfig.GetString("regionload_webserver_url","").Trim(); | 55 | string url = startupConfig.GetString("regionload_webserver_url", "").Trim(); |
57 | if (url == "") | 56 | if (url == "") |
58 | { | 57 | { |
59 | Console.MainLog.Instance.Error("WEBLOADER", "Unable to load webserver URL - URL was empty."); | 58 | MainLog.Instance.Error("WEBLOADER", "Unable to load webserver URL - URL was empty."); |
60 | return null; | 59 | return null; |
61 | } | 60 | } |
62 | else | 61 | else |
63 | { | 62 | { |
64 | 63 | HttpWebRequest webRequest = (HttpWebRequest) WebRequest.Create(url); | |
65 | HttpWebRequest webRequest = (HttpWebRequest)WebRequest.Create(url); | ||
66 | webRequest.Timeout = 30000; //30 Second Timeout | 64 | webRequest.Timeout = 30000; //30 Second Timeout |
67 | Console.MainLog.Instance.Debug("WEBLOADER", "Sending Download Request..."); | 65 | MainLog.Instance.Debug("WEBLOADER", "Sending Download Request..."); |
68 | HttpWebResponse webResponse = (HttpWebResponse)webRequest.GetResponse(); | 66 | HttpWebResponse webResponse = (HttpWebResponse) webRequest.GetResponse(); |
69 | Console.MainLog.Instance.Debug("WEBLOADER", "Downloading Region Information From Remote Server..."); | 67 | MainLog.Instance.Debug("WEBLOADER", "Downloading Region Information From Remote Server..."); |
70 | StreamReader reader = new StreamReader(webResponse.GetResponseStream()); | 68 | StreamReader reader = new StreamReader(webResponse.GetResponseStream()); |
71 | string xmlSource = ""; | 69 | string xmlSource = ""; |
72 | string tempStr = reader.ReadLine(); | 70 | string tempStr = reader.ReadLine(); |
@@ -75,7 +73,9 @@ namespace OpenSim.Framework.RegionLoader.Web | |||
75 | xmlSource = xmlSource + tempStr; | 73 | xmlSource = xmlSource + tempStr; |
76 | tempStr = reader.ReadLine(); | 74 | tempStr = reader.ReadLine(); |
77 | } | 75 | } |
78 | Console.MainLog.Instance.Debug("WEBLOADER", "Done downloading region information from server. Total Bytes: " + xmlSource.Length); | 76 | MainLog.Instance.Debug("WEBLOADER", |
77 | "Done downloading region information from server. Total Bytes: " + | ||
78 | xmlSource.Length); | ||
79 | XmlDocument xmlDoc = new XmlDocument(); | 79 | XmlDocument xmlDoc = new XmlDocument(); |
80 | xmlDoc.LoadXml(xmlSource); | 80 | xmlDoc.LoadXml(xmlSource); |
81 | if (xmlDoc.FirstChild.Name == "Regions") | 81 | if (xmlDoc.FirstChild.Name == "Regions") |
@@ -84,8 +84,9 @@ namespace OpenSim.Framework.RegionLoader.Web | |||
84 | int i; | 84 | int i; |
85 | for (i = 0; i < xmlDoc.FirstChild.ChildNodes.Count; i++) | 85 | for (i = 0; i < xmlDoc.FirstChild.ChildNodes.Count; i++) |
86 | { | 86 | { |
87 | Console.MainLog.Instance.Debug(xmlDoc.FirstChild.ChildNodes[i].OuterXml); | 87 | MainLog.Instance.Debug(xmlDoc.FirstChild.ChildNodes[i].OuterXml); |
88 | regionInfos[i] = new RegionInfo("REGION CONFIG #" + (i + 1), xmlDoc.FirstChild.ChildNodes[i]); | 88 | regionInfos[i] = |
89 | new RegionInfo("REGION CONFIG #" + (i + 1), xmlDoc.FirstChild.ChildNodes[i]); | ||
89 | } | 90 | } |
90 | 91 | ||
91 | return regionInfos; | 92 | return regionInfos; |
@@ -95,4 +96,4 @@ namespace OpenSim.Framework.RegionLoader.Web | |||
95 | } | 96 | } |
96 | } | 97 | } |
97 | } | 98 | } |
98 | } | 99 | } \ No newline at end of file |