ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-07 17:55:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster

Browse Source 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
This commit is contained in:
Melanie
2013-04-30 23:45:38 +01:00
parent 7c729e1519 46ae84cfba
commit b89d18e6f4
9 changed files with 549 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -171,11 +171,6 @@ namespace OpenSim.Server.Base
m_console = MainConsole.Instance;
// Configure the appenders for log4net
//
OpenSimAppender consoleAppender = null;
FileAppender fileAppender = null;
if (logConfig != null)
{
FileInfo cfg = new FileInfo(logConfig);