aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Server')
-rw-r--r--OpenSim/Server/Base/HttpServerBase.cs2
-rw-r--r--OpenSim/Server/Base/ServicesServerBase.cs19
2 files changed, 6 insertions, 15 deletions
diff --git a/OpenSim/Server/Base/HttpServerBase.cs b/OpenSim/Server/Base/HttpServerBase.cs
index 29b1c00..954783c 100644
--- a/OpenSim/Server/Base/HttpServerBase.cs
+++ b/OpenSim/Server/Base/HttpServerBase.cs
@@ -52,7 +52,7 @@ namespace OpenSim.Server.Base
52 52
53 protected override void ReadConfig() 53 protected override void ReadConfig()
54 { 54 {
55 IConfig networkConfig = m_Config.Configs["Network"]; 55 IConfig networkConfig = Config.Configs["Network"];
56 56
57 if (networkConfig == null) 57 if (networkConfig == null)
58 { 58 {
diff --git a/OpenSim/Server/Base/ServicesServerBase.cs b/OpenSim/Server/Base/ServicesServerBase.cs
index ade4bab..2c2b8ed 100644
--- a/OpenSim/Server/Base/ServicesServerBase.cs
+++ b/OpenSim/Server/Base/ServicesServerBase.cs
@@ -56,15 +56,6 @@ namespace OpenSim.Server.Base
56 // 56 //
57 protected string[] m_Arguments; 57 protected string[] m_Arguments;
58 58
59 // Configuration
60 //
61 protected IConfigSource m_Config = null;
62
63 public IConfigSource Config
64 {
65 get { return m_Config; }
66 }
67
68 // Run flag 59 // Run flag
69 // 60 //
70 private bool m_Running = true; 61 private bool m_Running = true;
@@ -118,11 +109,11 @@ namespace OpenSim.Server.Base
118 configUri.Scheme == Uri.UriSchemeHttp) 109 configUri.Scheme == Uri.UriSchemeHttp)
119 { 110 {
120 XmlReader r = XmlReader.Create(iniFile); 111 XmlReader r = XmlReader.Create(iniFile);
121 m_Config = new XmlConfigSource(r); 112 Config = new XmlConfigSource(r);
122 } 113 }
123 else 114 else
124 { 115 {
125 m_Config = new IniConfigSource(iniFile); 116 Config = new IniConfigSource(iniFile);
126 } 117 }
127 } 118 }
128 catch (Exception e) 119 catch (Exception e)
@@ -134,13 +125,13 @@ namespace OpenSim.Server.Base
134 // Merge the configuration from the command line into the 125 // Merge the configuration from the command line into the
135 // loaded file 126 // loaded file
136 // 127 //
137 m_Config.Merge(argvConfig); 128 Config.Merge(argvConfig);
138 129
139 // Refresh the startupConfig post merge 130 // Refresh the startupConfig post merge
140 // 131 //
141 if (m_Config.Configs["Startup"] != null) 132 if (Config.Configs["Startup"] != null)
142 { 133 {
143 startupConfig = m_Config.Configs["Startup"]; 134 startupConfig = Config.Configs["Startup"];
144 } 135 }
145 136
146 prompt = startupConfig.GetString("Prompt", prompt); 137 prompt = startupConfig.GetString("Prompt", prompt);