aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Tools/Configger/ConfigurationLoader.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Tools/Configger/ConfigurationLoader.cs')
-rw-r--r--OpenSim/Tools/Configger/ConfigurationLoader.cs17
1 files changed, 6 insertions, 11 deletions
diff --git a/OpenSim/Tools/Configger/ConfigurationLoader.cs b/OpenSim/Tools/Configger/ConfigurationLoader.cs
index 28bcc99..f1d3649 100644
--- a/OpenSim/Tools/Configger/ConfigurationLoader.cs
+++ b/OpenSim/Tools/Configger/ConfigurationLoader.cs
@@ -64,14 +64,13 @@ namespace OpenSim.Tools.Configger
64 /// <param name="configSettings"></param> 64 /// <param name="configSettings"></param>
65 /// <param name="networkInfo"></param> 65 /// <param name="networkInfo"></param>
66 /// <returns>A configuration that gets passed to modules</returns> 66 /// <returns>A configuration that gets passed to modules</returns>
67 public IConfigSource LoadConfigSettings() 67 public IConfigSource LoadConfigSettings(IConfig startupConfig)
68 { 68 {
69 bool iniFileExists = false; 69 bool iniFileExists = false;
70 70
71 List<string> sources = new List<string>(); 71 List<string> sources = new List<string>();
72 72
73 string iniFileName = "OpenSim.ini"; 73 string iniFileName = startupConfig.GetString("inifile", Path.Combine(".", "OpenSim.ini"));
74 string iniFilePath = Path.Combine(".", iniFileName);
75 74
76 if (IsUri(iniFileName)) 75 if (IsUri(iniFileName))
77 { 76 {
@@ -80,10 +79,10 @@ namespace OpenSim.Tools.Configger
80 } 79 }
81 else 80 else
82 { 81 {
83 if (File.Exists(iniFilePath)) 82 if (File.Exists(iniFileName))
84 { 83 {
85 if (!sources.Contains(iniFilePath)) 84 if (!sources.Contains(iniFileName))
86 sources.Add(iniFilePath); 85 sources.Add(iniFileName);
87 } 86 }
88 } 87 }
89 88
@@ -239,10 +238,7 @@ namespace OpenSim.Tools.Configger
239 config.Set("physics", "OpenDynamicsEngine"); 238 config.Set("physics", "OpenDynamicsEngine");
240 config.Set("meshing", "Meshmerizer"); 239 config.Set("meshing", "Meshmerizer");
241 config.Set("physical_prim", true); 240 config.Set("physical_prim", true);
242 config.Set("see_into_this_sim_from_neighbor", true);
243 config.Set("serverside_object_permissions", true); 241 config.Set("serverside_object_permissions", true);
244 config.Set("storage_plugin", "OpenSim.Data.SQLite.dll");
245 config.Set("storage_connection_string", "URI=file:OpenSim.db,version=3");
246 config.Set("storage_prim_inventories", true); 242 config.Set("storage_prim_inventories", true);
247 config.Set("startup_console_commands_file", String.Empty); 243 config.Set("startup_console_commands_file", String.Empty);
248 config.Set("shutdown_console_commands_file", String.Empty); 244 config.Set("shutdown_console_commands_file", String.Empty);
@@ -254,6 +250,5 @@ namespace OpenSim.Tools.Configger
254 250
255 return defaultConfig; 251 return defaultConfig;
256 } 252 }
257
258 } 253 }
259} 254} \ No newline at end of file