diff options
author | mingchen | 2007-08-17 15:45:49 +0000 |
---|---|---|
committer | mingchen | 2007-08-17 15:45:49 +0000 |
commit | d3660ed2692863757214f92c02b5b9e9d7f683cf (patch) | |
tree | 2595969e44eb13c34ca5c9231629971aef814f4f /OpenSim/Region/Application/OpenSimMain.cs | |
parent | * Added support for the IMG-format loader to terrain's load-tile function. (diff) | |
download | opensim-SC_OLD-d3660ed2692863757214f92c02b5b9e9d7f683cf.zip opensim-SC_OLD-d3660ed2692863757214f92c02b5b9e9d7f683cf.tar.gz opensim-SC_OLD-d3660ed2692863757214f92c02b5b9e9d7f683cf.tar.bz2 opensim-SC_OLD-d3660ed2692863757214f92c02b5b9e9d7f683cf.tar.xz |
*Moved network_servers_info.xml into OpenSim.ini under [Network]
Diffstat (limited to 'OpenSim/Region/Application/OpenSimMain.cs')
-rw-r--r-- | OpenSim/Region/Application/OpenSimMain.cs | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs index 71fa2c0..e58fb2a 100644 --- a/OpenSim/Region/Application/OpenSimMain.cs +++ b/OpenSim/Region/Application/OpenSimMain.cs | |||
@@ -102,6 +102,7 @@ namespace OpenSim | |||
102 | 102 | ||
103 | protected void ReadConfigSettings(IConfigSource configSource) | 103 | protected void ReadConfigSettings(IConfigSource configSource) |
104 | { | 104 | { |
105 | m_networkServersInfo = new NetworkServersInfo(); | ||
105 | m_sandbox = !configSource.Configs["Startup"].GetBoolean("gridmode", false); | 106 | m_sandbox = !configSource.Configs["Startup"].GetBoolean("gridmode", false); |
106 | m_physicsEngine = configSource.Configs["Startup"].GetString("physics", "basicphysics"); | 107 | m_physicsEngine = configSource.Configs["Startup"].GetString("physics", "basicphysics"); |
107 | m_silent = configSource.Configs["Startup"].GetBoolean("noverbose", false); | 108 | m_silent = configSource.Configs["Startup"].GetBoolean("noverbose", false); |
@@ -114,6 +115,8 @@ namespace OpenSim | |||
114 | standaloneWelcomeMessage = configSource.Configs["StandAlone"].GetString("welcome_message", "Welcome to OpenSim"); | 115 | standaloneWelcomeMessage = configSource.Configs["StandAlone"].GetString("welcome_message", "Welcome to OpenSim"); |
115 | standaloneInventoryPlugin = configSource.Configs["StandAlone"].GetString("inventory_plugin", "OpenSim.Framework.Data.SQLite.dll"); | 116 | standaloneInventoryPlugin = configSource.Configs["StandAlone"].GetString("inventory_plugin", "OpenSim.Framework.Data.SQLite.dll"); |
116 | standaloneUserPlugin = configSource.Configs["StandAlone"].GetString("userDatabase_plugin", "OpenSim.Framework.Data.DB4o.dll"); | 117 | standaloneUserPlugin = configSource.Configs["StandAlone"].GetString("userDatabase_plugin", "OpenSim.Framework.Data.DB4o.dll"); |
118 | |||
119 | m_networkServersInfo.loadFromConfiguration(configSource); | ||
117 | } | 120 | } |
118 | 121 | ||
119 | /// <summary> | 122 | /// <summary> |
@@ -134,9 +137,9 @@ namespace OpenSim | |||
134 | if (m_sandbox) | 137 | if (m_sandbox) |
135 | { | 138 | { |
136 | CommunicationsLocal.LocalSettings settings = new CommunicationsLocal.LocalSettings(standaloneWelcomeMessage, standaloneAuthenticate, standaloneInventoryPlugin, standaloneUserPlugin); | 139 | CommunicationsLocal.LocalSettings settings = new CommunicationsLocal.LocalSettings(standaloneWelcomeMessage, standaloneAuthenticate, standaloneInventoryPlugin, standaloneUserPlugin); |
137 | CommunicationsLocal localComms = new CommunicationsLocal(m_networkServersInfo, m_httpServer, m_assetCache, settings); | 140 | CommunicationsLocal localComms = new CommunicationsLocal(m_networkServersInfo, m_httpServer, m_assetCache, settings); |
138 | m_commsManager = localComms; | 141 | m_commsManager = localComms; |
139 | if(standaloneAuthenticate) | 142 | if (standaloneAuthenticate) |
140 | { | 143 | { |
141 | this.CreateAccount = localComms.doCreate; | 144 | this.CreateAccount = localComms.doCreate; |
142 | } | 145 | } |
@@ -164,7 +167,7 @@ namespace OpenSim | |||
164 | 167 | ||
165 | // Load all script engines found | 168 | // Load all script engines found |
166 | OpenSim.Region.Environment.Scenes.Scripting.ScriptEngineLoader ScriptEngineLoader = new OpenSim.Region.Environment.Scenes.Scripting.ScriptEngineLoader(m_log); | 169 | OpenSim.Region.Environment.Scenes.Scripting.ScriptEngineLoader ScriptEngineLoader = new OpenSim.Region.Environment.Scenes.Scripting.ScriptEngineLoader(m_log); |
167 | 170 | ||
168 | for (int i = 0; i < configFiles.Length; i++) | 171 | for (int i = 0; i < configFiles.Length; i++) |
169 | { | 172 | { |
170 | //Console.WriteLine("Loading region config file"); | 173 | //Console.WriteLine("Loading region config file"); |
@@ -174,7 +177,7 @@ namespace OpenSim | |||
174 | UDPServer udpServer; | 177 | UDPServer udpServer; |
175 | Scene scene = SetupScene(regionInfo, out udpServer); | 178 | Scene scene = SetupScene(regionInfo, out udpServer); |
176 | 179 | ||
177 | 180 | ||
178 | OpenSim.Region.Environment.Scenes.Scripting.ScriptEngineInterface ScriptEngine = ScriptEngineLoader.LoadScriptEngine("DotNetEngine"); | 181 | OpenSim.Region.Environment.Scenes.Scripting.ScriptEngineInterface ScriptEngine = ScriptEngineLoader.LoadScriptEngine("DotNetEngine"); |
179 | scene.AddScriptEngine(ScriptEngine, m_log); | 182 | scene.AddScriptEngine(ScriptEngine, m_log); |
180 | // TODO: TEMP load default script | 183 | // TODO: TEMP load default script |
@@ -238,7 +241,6 @@ namespace OpenSim | |||
238 | 241 | ||
239 | protected override void Initialize() | 242 | protected override void Initialize() |
240 | { | 243 | { |
241 | m_networkServersInfo = new NetworkServersInfo("NETWORK SERVERS INFO", Path.Combine(Util.configDir(), "network_servers_information.xml")); | ||
242 | m_httpServerPort = m_networkServersInfo.HttpListenerPort; | 244 | m_httpServerPort = m_networkServersInfo.HttpListenerPort; |
243 | m_assetCache = new AssetCache("OpenSim.Region.GridInterfaces.Local.dll", m_networkServersInfo.AssetURL, m_networkServersInfo.AssetSendKey); | 245 | m_assetCache = new AssetCache("OpenSim.Region.GridInterfaces.Local.dll", m_networkServersInfo.AssetURL, m_networkServersInfo.AssetSendKey); |
244 | } | 246 | } |