aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
authorMelanie2013-03-01 23:54:00 +0000
committerMelanie2013-03-01 23:54:00 +0000
commita675f7d4c3af4550263985aafcefd11458f6d365 (patch)
tree6966e1d313f402a1de65efee535de493d648b4aa /OpenSim/Region/Application
parentMerge branch 'master' into careminster (diff)
parentMoved permissions config vars out of [Startup] into [Permissions]. Backwards ... (diff)
downloadopensim-SC-a675f7d4c3af4550263985aafcefd11458f6d365.zip
opensim-SC-a675f7d4c3af4550263985aafcefd11458f6d365.tar.gz
opensim-SC-a675f7d4c3af4550263985aafcefd11458f6d365.tar.bz2
opensim-SC-a675f7d4c3af4550263985aafcefd11458f6d365.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs4
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 7361f50..7497d88 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -138,6 +138,10 @@ namespace OpenSim
138 /// <param name="configSource"></param> 138 /// <param name="configSource"></param>
139 public OpenSimBase(IConfigSource configSource) : base() 139 public OpenSimBase(IConfigSource configSource) : base()
140 { 140 {
141 // FIXME: This should be done down in ServerBase but we need to sort out and refactor the log4net
142 // XmlConfigurator calls first accross servers.
143 m_log.InfoFormat("[SERVER BASE]: Starting in {0}", m_startupDirectory);
144
141 LoadConfigSettings(configSource); 145 LoadConfigSettings(configSource);
142 } 146 }
143 147