aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorTeravus Ovares (Dan Olivares)2010-05-16 01:47:53 -0400
committerTeravus Ovares (Dan Olivares)2010-05-16 01:47:53 -0400
commitd4192dcb2efd0e3a3a3ed887337344ada5b9b4c6 (patch)
treed81153063ee62cbde2ab15f502cacb8dbd47edf7 /OpenSim/Region
parentMerge branch 'master' of ssh://MyConnection/var/git/opensim (diff)
downloadopensim-SC_OLD-d4192dcb2efd0e3a3a3ed887337344ada5b9b4c6.zip
opensim-SC_OLD-d4192dcb2efd0e3a3a3ed887337344ada5b9b4c6.tar.gz
opensim-SC_OLD-d4192dcb2efd0e3a3a3ed887337344ada5b9b4c6.tar.bz2
opensim-SC_OLD-d4192dcb2efd0e3a3a3ed887337344ada5b9b4c6.tar.xz
* Revert last commit for now at Melanie_T's request.
* Additional ways of configuring opensim break with this
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Application/Application.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs
index 951d66f..b860cf6 100644
--- a/OpenSim/Region/Application/Application.cs
+++ b/OpenSim/Region/Application/Application.cs
@@ -123,6 +123,7 @@ namespace OpenSim
123 // Validate that the user has the most basic configuration done 123 // Validate that the user has the most basic configuration done
124 // If not, offer to do the most basic configuration for them warning them along the way of the importance of 124 // If not, offer to do the most basic configuration for them warning them along the way of the importance of
125 // reading these files. 125 // reading these files.
126 /*
126 m_log.Info("Checking for reguired configuration...\n"); 127 m_log.Info("Checking for reguired configuration...\n");
127 128
128 bool OpenSim_Ini = (File.Exists(Path.Combine(Util.configDir(), "OpenSim.ini"))) 129 bool OpenSim_Ini = (File.Exists(Path.Combine(Util.configDir(), "OpenSim.ini")))
@@ -225,7 +226,7 @@ namespace OpenSim
225 } 226 }
226 MainConsole.Instance = null; 227 MainConsole.Instance = null;
227 } 228 }
228 229 */
229 configSource.Alias.AddAlias("On", true); 230 configSource.Alias.AddAlias("On", true);
230 configSource.Alias.AddAlias("Off", false); 231 configSource.Alias.AddAlias("Off", false);
231 configSource.Alias.AddAlias("True", true); 232 configSource.Alias.AddAlias("True", true);