aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application/OpenSimMain.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Application/OpenSimMain.cs')
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs14
1 files changed, 12 insertions, 2 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index e57ba27..248bd42 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -77,14 +77,14 @@ namespace OpenSim
77 string iniFile = startupSource.Configs["Startup"].GetString("inifile", "NA"); 77 string iniFile = startupSource.Configs["Startup"].GetString("inifile", "NA");
78 if (iniFile != "NA") 78 if (iniFile != "NA")
79 { 79 {
80 //a ini is set to be used for startup settings 80 //a INI file is set to be used for startup settings
81 string iniFilePath = Path.Combine(Util.configDir(), iniFile); 81 string iniFilePath = Path.Combine(Util.configDir(), iniFile);
82 if (File.Exists(iniFilePath)) 82 if (File.Exists(iniFilePath))
83 { 83 {
84 startupSource = new IniConfigSource(iniFilePath); 84 startupSource = new IniConfigSource(iniFilePath);
85 85
86 //enable follow line, if we want the original config source(normally commandline args) merged with ini file settings. 86 //enable follow line, if we want the original config source(normally commandline args) merged with ini file settings.
87 //in this case we have it so if both sources have the same named setting, command line value will overwrite the ini file value. 87 //in this case we have it so that if both sources have the same named setting, the command line value will overwrite the ini file value.
88 //(as if someone has bothered to enter a command line arg, we should take notice of it) 88 //(as if someone has bothered to enter a command line arg, we should take notice of it)
89 //startupSource.Merge(configSource); 89 //startupSource.Merge(configSource);
90 } 90 }
@@ -121,6 +121,15 @@ namespace OpenSim
121 m_httpServer.AddStreamHandler(new SimStatusHandler()); 121 m_httpServer.AddStreamHandler(new SimStatusHandler());
122 } 122 }
123 123
124 if (m_sandbox)
125 {
126 m_commsManager = new CommunicationsLocal(m_networkServersInfo, m_httpServer, m_assetCache);
127 }
128 else
129 {
130 m_commsManager = new CommunicationsOGS1(m_networkServersInfo, m_httpServer, m_assetCache);
131 }
132
124 string regionConfigPath = Path.Combine(Util.configDir(), "Regions"); 133 string regionConfigPath = Path.Combine(Util.configDir(), "Regions");
125 134
126 if (!Directory.Exists(regionConfigPath)) 135 if (!Directory.Exists(regionConfigPath))
@@ -227,6 +236,7 @@ namespace OpenSim
227 } 236 }
228 237
229 #endregion 238 #endregion
239
230 /// <summary> 240 /// <summary>
231 /// Performs any last-minute sanity checking and shuts down the region server 241 /// Performs any last-minute sanity checking and shuts down the region server
232 /// </summary> 242 /// </summary>