diff options
author | MW | 2007-10-26 15:00:35 +0000 |
---|---|---|
committer | MW | 2007-10-26 15:00:35 +0000 |
commit | 5b8c31c3bdfac64a25ebcbbce0ab9988eb92b6c5 (patch) | |
tree | dd51b9130d1537648e7277fbda18f706ad839acd /OpenSim/Region | |
parent | * Added prototypical AvatarFactory module interface to load avatar parameters (diff) | |
download | opensim-SC-5b8c31c3bdfac64a25ebcbbce0ab9988eb92b6c5.zip opensim-SC-5b8c31c3bdfac64a25ebcbbce0ab9988eb92b6c5.tar.gz opensim-SC-5b8c31c3bdfac64a25ebcbbce0ab9988eb92b6c5.tar.bz2 opensim-SC-5b8c31c3bdfac64a25ebcbbce0ab9988eb92b6c5.tar.xz |
Temporary fix for a missing Opensim.ini file.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/Application/Application.cs | 3 | ||||
-rw-r--r-- | OpenSim/Region/Application/OpenSimMain.cs | 10 |
2 files changed, 3 insertions, 10 deletions
diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs index 8079ab8..9cb4f76 100644 --- a/OpenSim/Region/Application/Application.cs +++ b/OpenSim/Region/Application/Application.cs | |||
@@ -67,6 +67,9 @@ namespace OpenSim | |||
67 | configSource.AddSwitch("Startup", "verbose"); | 67 | configSource.AddSwitch("Startup", "verbose"); |
68 | configSource.AddSwitch("Startup", "useexecutepath"); | 68 | configSource.AddSwitch("Startup", "useexecutepath"); |
69 | 69 | ||
70 | configSource.AddConfig("StandAlone"); | ||
71 | configSource.AddConfig("Network"); | ||
72 | |||
70 | OpenSimMain sim = new OpenSimMain(configSource); | 73 | OpenSimMain sim = new OpenSimMain(configSource); |
71 | 74 | ||
72 | sim.StartUp(); | 75 | sim.StartUp(); |
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs index fdaaa51..8047b1b 100644 --- a/OpenSim/Region/Application/OpenSimMain.cs +++ b/OpenSim/Region/Application/OpenSimMain.cs | |||
@@ -110,10 +110,6 @@ namespace OpenSim | |||
110 | if (File.Exists(iniFilePath)) | 110 | if (File.Exists(iniFilePath)) |
111 | { | 111 | { |
112 | m_config = new IniConfigSource(iniFilePath); | 112 | m_config = new IniConfigSource(iniFilePath); |
113 | |||
114 | //enable following line, if we want the original config source(normally commandline args) merged with ini file settings. | ||
115 | //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. | ||
116 | //(as if someone has bothered to enter a command line arg, we should take notice of it) | ||
117 | m_config.Merge(configSource); | 113 | m_config.Merge(configSource); |
118 | } | 114 | } |
119 | else | 115 | else |
@@ -145,12 +141,6 @@ namespace OpenSim | |||
145 | m_scriptEngine = startupConfig.GetString("script_engine", "DotNetEngine"); | 141 | m_scriptEngine = startupConfig.GetString("script_engine", "DotNetEngine"); |
146 | 142 | ||
147 | m_assetStorage = startupConfig.GetString("asset_database", "db4o"); | 143 | m_assetStorage = startupConfig.GetString("asset_database", "db4o"); |
148 | |||
149 | // wtf? | ||
150 | startupConfig.GetBoolean("default_modules", true); | ||
151 | startupConfig.GetBoolean("default_shared_modules", true); | ||
152 | startupConfig.GetString("except_modules", ""); | ||
153 | startupConfig.GetString("except_shared_modules", ""); | ||
154 | } | 144 | } |
155 | 145 | ||
156 | IConfig standaloneConfig = m_config.Configs["StandAlone"]; | 146 | IConfig standaloneConfig = m_config.Configs["StandAlone"]; |