aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application/OpenSimBase.cs
diff options
context:
space:
mode:
authorBlueWall2013-03-05 15:30:54 -0500
committerBlueWall2013-03-05 15:30:54 -0500
commitf676408e2a45101bcab0a33f598ea9047f02036a (patch)
treeeb34ea8fb0a783ee466873462285eba629ab6405 /OpenSim/Region/Application/OpenSimBase.cs
parentAdd method to remove JsonRpc Handlers from the server (diff)
parent* Add a Max Payload size property to the Websocket Server Handler. If you ... (diff)
downloadopensim-SC_OLD-f676408e2a45101bcab0a33f598ea9047f02036a.zip
opensim-SC_OLD-f676408e2a45101bcab0a33f598ea9047f02036a.tar.gz
opensim-SC_OLD-f676408e2a45101bcab0a33f598ea9047f02036a.tar.bz2
opensim-SC_OLD-f676408e2a45101bcab0a33f598ea9047f02036a.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Application/OpenSimBase.cs')
-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 c555915..137bd81 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -134,6 +134,10 @@ namespace OpenSim
134 /// <param name="configSource"></param> 134 /// <param name="configSource"></param>
135 public OpenSimBase(IConfigSource configSource) : base() 135 public OpenSimBase(IConfigSource configSource) : base()
136 { 136 {
137 // FIXME: This should be done down in ServerBase but we need to sort out and refactor the log4net
138 // XmlConfigurator calls first accross servers.
139 m_log.InfoFormat("[SERVER BASE]: Starting in {0}", m_startupDirectory);
140
137 LoadConfigSettings(configSource); 141 LoadConfigSettings(configSource);
138 } 142 }
139 143