diff options
author | Adam Frisby | 2008-04-21 07:09:17 +0000 |
---|---|---|
committer | Adam Frisby | 2008-04-21 07:09:17 +0000 |
commit | fef3b3689492dea63693c964bcdbec9f5137eb5e (patch) | |
tree | 7791eef001d85d3e1de863a68f26ff9434d062ca /OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs | |
parent | * Terrain Module code has been reformatted to comply with guidelines. (diff) | |
download | opensim-SC_OLD-fef3b3689492dea63693c964bcdbec9f5137eb5e.zip opensim-SC_OLD-fef3b3689492dea63693c964bcdbec9f5137eb5e.tar.gz opensim-SC_OLD-fef3b3689492dea63693c964bcdbec9f5137eb5e.tar.bz2 opensim-SC_OLD-fef3b3689492dea63693c964bcdbec9f5137eb5e.tar.xz |
* Optimised using statements and namespace references across entire project (this took a while to run).
Diffstat (limited to 'OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs')
-rw-r--r-- | OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs b/OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs index 098e305..17077e7 100644 --- a/OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs +++ b/OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs | |||
@@ -25,17 +25,19 @@ | |||
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; | ||
28 | using System.IO; | 29 | using System.IO; |
29 | using System.Net; | 30 | using System.Net; |
31 | using System.Reflection; | ||
30 | using System.Xml; | 32 | using System.Xml; |
33 | using log4net; | ||
31 | using Nini.Config; | 34 | using Nini.Config; |
32 | using OpenSim.Framework.Console; | ||
33 | 35 | ||
34 | namespace OpenSim.Framework.RegionLoader.Web | 36 | namespace OpenSim.Framework.RegionLoader.Web |
35 | { | 37 | { |
36 | public class RegionLoaderWebServer : IRegionLoader | 38 | public class RegionLoaderWebServer : IRegionLoader |
37 | { | 39 | { |
38 | private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 40 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
39 | 41 | ||
40 | private IniConfigSource m_configSouce; | 42 | private IniConfigSource m_configSouce; |
41 | 43 | ||
@@ -54,8 +56,8 @@ namespace OpenSim.Framework.RegionLoader.Web | |||
54 | else | 56 | else |
55 | { | 57 | { |
56 | IniConfig startupConfig = (IniConfig) m_configSouce.Configs["Startup"]; | 58 | IniConfig startupConfig = (IniConfig) m_configSouce.Configs["Startup"]; |
57 | string url = startupConfig.GetString("regionload_webserver_url", System.String.Empty).Trim(); | 59 | string url = startupConfig.GetString("regionload_webserver_url", String.Empty).Trim(); |
58 | if (url == System.String.Empty) | 60 | if (url == String.Empty) |
59 | { | 61 | { |
60 | m_log.Error("[WEBLOADER]: Unable to load webserver URL - URL was empty."); | 62 | m_log.Error("[WEBLOADER]: Unable to load webserver URL - URL was empty."); |
61 | return null; | 63 | return null; |
@@ -68,7 +70,7 @@ namespace OpenSim.Framework.RegionLoader.Web | |||
68 | HttpWebResponse webResponse = (HttpWebResponse) webRequest.GetResponse(); | 70 | HttpWebResponse webResponse = (HttpWebResponse) webRequest.GetResponse(); |
69 | m_log.Debug("[WEBLOADER]: Downloading Region Information From Remote Server..."); | 71 | m_log.Debug("[WEBLOADER]: Downloading Region Information From Remote Server..."); |
70 | StreamReader reader = new StreamReader(webResponse.GetResponseStream()); | 72 | StreamReader reader = new StreamReader(webResponse.GetResponseStream()); |
71 | string xmlSource = System.String.Empty; | 73 | string xmlSource = String.Empty; |
72 | string tempStr = reader.ReadLine(); | 74 | string tempStr = reader.ReadLine(); |
73 | while (tempStr != null) | 75 | while (tempStr != null) |
74 | { | 76 | { |