diff options
Diffstat (limited to 'OpenSim/Tools/Configger/ConfigurationLoader.cs')
-rw-r--r-- | OpenSim/Tools/Configger/ConfigurationLoader.cs | 36 |
1 files changed, 31 insertions, 5 deletions
diff --git a/OpenSim/Tools/Configger/ConfigurationLoader.cs b/OpenSim/Tools/Configger/ConfigurationLoader.cs index f1d3649..fa3a5bf 100644 --- a/OpenSim/Tools/Configger/ConfigurationLoader.cs +++ b/OpenSim/Tools/Configger/ConfigurationLoader.cs | |||
@@ -70,6 +70,36 @@ namespace OpenSim.Tools.Configger | |||
70 | 70 | ||
71 | List<string> sources = new List<string>(); | 71 | List<string> sources = new List<string>(); |
72 | 72 | ||
73 | string masterFileName = startupConfig.GetString("inimaster", "OpenSimDefaults.ini"); | ||
74 | |||
75 | if (masterFileName == "none") | ||
76 | masterFileName = String.Empty; | ||
77 | |||
78 | if (IsUri(masterFileName)) | ||
79 | { | ||
80 | if (!sources.Contains(masterFileName)) | ||
81 | sources.Add(masterFileName); | ||
82 | } | ||
83 | else | ||
84 | { | ||
85 | string masterFilePath = Path.GetFullPath( | ||
86 | Path.Combine(Util.configDir(), masterFileName)); | ||
87 | |||
88 | if (masterFileName != String.Empty) | ||
89 | { | ||
90 | if (File.Exists(masterFilePath)) | ||
91 | { | ||
92 | if (!sources.Contains(masterFilePath)) | ||
93 | sources.Add(masterFilePath); | ||
94 | } | ||
95 | else | ||
96 | { | ||
97 | m_log.ErrorFormat("Master ini file {0} not found", Path.GetFullPath(masterFilePath)); | ||
98 | Environment.Exit(1); | ||
99 | } | ||
100 | } | ||
101 | } | ||
102 | |||
73 | string iniFileName = startupConfig.GetString("inifile", Path.Combine(".", "OpenSim.ini")); | 103 | string iniFileName = startupConfig.GetString("inifile", Path.Combine(".", "OpenSim.ini")); |
74 | 104 | ||
75 | if (IsUri(iniFileName)) | 105 | if (IsUri(iniFileName)) |
@@ -234,21 +264,17 @@ namespace OpenSim.Tools.Configger | |||
234 | config.Set("region_info_source", "filesystem"); | 264 | config.Set("region_info_source", "filesystem"); |
235 | config.Set("allow_regionless", false); | 265 | config.Set("allow_regionless", false); |
236 | 266 | ||
237 | config.Set("gridmode", false); | ||
238 | config.Set("physics", "OpenDynamicsEngine"); | 267 | config.Set("physics", "OpenDynamicsEngine"); |
239 | config.Set("meshing", "Meshmerizer"); | 268 | config.Set("meshing", "Meshmerizer"); |
240 | config.Set("physical_prim", true); | 269 | config.Set("physical_prim", true); |
241 | config.Set("serverside_object_permissions", true); | 270 | config.Set("serverside_object_permissions", true); |
242 | config.Set("storage_prim_inventories", true); | ||
243 | config.Set("startup_console_commands_file", String.Empty); | 271 | config.Set("startup_console_commands_file", String.Empty); |
244 | config.Set("shutdown_console_commands_file", String.Empty); | 272 | config.Set("shutdown_console_commands_file", String.Empty); |
245 | config.Set("DefaultScriptEngine", "XEngine"); | 273 | config.Set("DefaultScriptEngine", "XEngine"); |
246 | config.Set("clientstack_plugin", "OpenSim.Region.ClientStack.LindenUDP.dll"); | 274 | config.Set("clientstack_plugin", "OpenSim.Region.ClientStack.LindenUDP.dll"); |
247 | // life doesn't really work without this | ||
248 | config.Set("EventQueue", true); | ||
249 | } | 275 | } |
250 | 276 | ||
251 | return defaultConfig; | 277 | return defaultConfig; |
252 | } | 278 | } |
253 | } | 279 | } |
254 | } \ No newline at end of file | 280 | } |