OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim

viewer-2-initial-appearance
Melanie 2010-10-05 02:12:35 +01:00
parent eb17d581d3 bc9f793a92
commit ba0a19c228
15 changed files with 66 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Server/Base/ServicesServerBase.cs
View File

@ -176,7 +176,7 @@ namespace OpenSim.Server.Base
OpenSimAppender consoleAppender = null; OpenSimAppender consoleAppender = null;
FileAppender fileAppender = null; FileAppender fileAppender = null;
if ( logConfig != null ) if (logConfig != null)
{ {
FileInfo cfg = new FileInfo(logConfig); FileInfo cfg = new FileInfo(logConfig);
XmlConfigurator.Configure(cfg); XmlConfigurator.Configure(cfg);

1
bin/config-include/Standalone.ini
View File

@ -88,7 +88,6 @@
WelcomeMessage = "Welcome, Avatar!" WelcomeMessage = "Welcome, Avatar!"
;; This should always be the very last thing on this file ;; This should always be the very last thing on this file
[Includes] [Includes]
Include-Common = "config-include/StandaloneCommon.ini" Include-Common = "config-include/StandaloneCommon.ini"