Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
commit
ba0a19c228
|
@ -176,7 +176,7 @@ namespace OpenSim.Server.Base
|
|||
OpenSimAppender consoleAppender = null;
|
||||
FileAppender fileAppender = null;
|
||||
|
||||
if ( logConfig != null )
|
||||
if (logConfig != null)
|
||||
{
|
||||
FileInfo cfg = new FileInfo(logConfig);
|
||||
XmlConfigurator.Configure(cfg);
|
||||
|
|
|
@ -88,7 +88,6 @@
|
|||
|
||||
WelcomeMessage = "Welcome, Avatar!"
|
||||
|
||||
|
||||
;; This should always be the very last thing on this file
|
||||
[Includes]
|
||||
Include-Common = "config-include/StandaloneCommon.ini"
|
||||
|
|
Loading…
Reference in New Issue