diff options
author | MW | 2007-08-09 12:59:42 +0000 |
---|---|---|
committer | MW | 2007-08-09 12:59:42 +0000 |
commit | a56a17fab20e1ef94e70dbf6648ebb2f437de364 (patch) | |
tree | e19a6a858725ffadbcf34c8f9a7409db350a5681 /OpenSim/Region/Application | |
parent | Transition between not flying / flying should be smoother (diff) | |
download | opensim-SC_OLD-a56a17fab20e1ef94e70dbf6648ebb2f437de364.zip opensim-SC_OLD-a56a17fab20e1ef94e70dbf6648ebb2f437de364.tar.gz opensim-SC_OLD-a56a17fab20e1ef94e70dbf6648ebb2f437de364.tar.bz2 opensim-SC_OLD-a56a17fab20e1ef94e70dbf6648ebb2f437de364.tar.xz |
Making sure my local working copy is in sync with svn before I start the job of enabling the new SceneObject classes.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Application/OpenSimMain.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs index 248bd42..8e3f558 100644 --- a/OpenSim/Region/Application/OpenSimMain.cs +++ b/OpenSim/Region/Application/OpenSimMain.cs | |||
@@ -83,7 +83,7 @@ namespace OpenSim | |||
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 following line, if we want the original config source(normally commandline args) merged with ini file settings. |
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. | 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); |