aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
authorTeravus Ovares (Dan Olivares)2009-08-07 20:32:23 -0400
committerTeravus Ovares (Dan Olivares)2009-08-07 20:32:23 -0400
commitd842c1d459212db9dd51020c9e9ee8a12a0e5a0c (patch)
treead7617481c6094e648c2f161dc59afa16a28ea50 /OpenSim/Region/Application
parentThis is the second part of the 'not crash on regionsize changes'. This le... (diff)
parentMerge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-d842c1d459212db9dd51020c9e9ee8a12a0e5a0c.zip
opensim-SC_OLD-d842c1d459212db9dd51020c9e9ee8a12a0e5a0c.tar.gz
opensim-SC_OLD-d842c1d459212db9dd51020c9e9ee8a12a0e5a0c.tar.bz2
opensim-SC_OLD-d842c1d459212db9dd51020c9e9ee8a12a0e5a0c.tar.xz
Merge branch 'master' of ssh://MyConnection/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r--OpenSim/Region/Application/ConfigurationLoader.cs1
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Region/Application/ConfigurationLoader.cs b/OpenSim/Region/Application/ConfigurationLoader.cs
index 3bdbc7d..3a65242 100644
--- a/OpenSim/Region/Application/ConfigurationLoader.cs
+++ b/OpenSim/Region/Application/ConfigurationLoader.cs
@@ -186,7 +186,6 @@ namespace OpenSim
186 } 186 }
187 else 187 else
188 { 188 {
189 m_log.InfoFormat("Adding {0} to configuration", Path.Combine(Util.configDir(), file));
190 string basepath = Path.GetFullPath(Util.configDir()); 189 string basepath = Path.GetFullPath(Util.configDir());
191 string path = Path.Combine(basepath, file); 190 string path = Path.Combine(basepath, file);
192 string[] paths = Util.Glob(path); 191 string[] paths = Util.Glob(path);