mirror of
https://github.com/opensim/opensim.git
synced 2026-08-12 04:05:42 +08:00
Converted logging to use log4net.
Changed LogBase to ConsoleBase, which handles console I/O. This is mostly an in-place conversion, so lots of refactoring can still be done.
This commit is contained in:
@@ -31,6 +31,7 @@ using System.Net.Sockets;
|
||||
using System.Xml;
|
||||
using libsecondlife;
|
||||
using Nini.Config;
|
||||
using OpenSim.Framework.Console;
|
||||
|
||||
namespace OpenSim.Framework
|
||||
{
|
||||
@@ -176,7 +177,7 @@ namespace OpenSim.Framework
|
||||
public string MasterAvatarSandboxPassword = String.Empty;
|
||||
|
||||
// Apparently, we're applying the same estatesettings regardless of whether it's local or remote.
|
||||
private static EstateSettings m_estateSettings;
|
||||
private EstateSettings m_estateSettings;
|
||||
|
||||
public EstateSettings EstateSettings
|
||||
{
|
||||
@@ -196,7 +197,7 @@ namespace OpenSim.Framework
|
||||
public RegionInfo(string description, string filename, bool skipConsoleConfig)
|
||||
{
|
||||
configMember =
|
||||
new ConfigurationMember(filename, description, loadConfigurationOptions, handleIncomingConfiguration,!skipConsoleConfig);
|
||||
new ConfigurationMember(filename, description, loadConfigurationOptions, handleIncomingConfiguration, !skipConsoleConfig);
|
||||
configMember.performConfigurationRetrieve();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user