Mantis#3218. Thank you kindly, TLaukkan (Tommil) for a patch that:

* Added log4net dependency to physxplugin in prebuild.xml.
* Added missing m_log fields to classes.
* Replaced Console.WriteLine with appropriate m_log.Xxxx
* Tested that nant test target runs succesfully.
* Tested that local opensim sandbox starts up without errors.
This commit is contained in:
Charles Krinke
2009-02-22 20:52:55 +00:00
parent 913654f2c9
commit 8f55b9d735
117 changed files with 580 additions and 409 deletions

View File

@@ -55,15 +55,15 @@ namespace OpenSim
XmlConfigurator.Configure();
Console.Write("Performing compatibility checks... ");
m_log.Info("Performing compatibility checks... ");
string supported = String.Empty;
if (Util.IsEnvironmentSupported(ref supported))
{
Console.WriteLine(" Environment is compatible.\n");
m_log.Info("Environment is compatible.\n");
}
else
{
Console.WriteLine(" Environment is unsupported (" + supported + ")\n");
m_log.Warn("Environment is unsupported (" + supported + ")\n");
}
Culture.SetCurrentCulture();
@@ -115,7 +115,7 @@ namespace OpenSim
}
catch (Exception e)
{
Console.WriteLine("Caught exception from command: {0}", e);
m_log.Error("Caught exception from command: {0}", e);
}
}
}

View File

@@ -265,7 +265,7 @@ namespace OpenSim
if (m_configSettings.StorageDll == "OpenSim.DataStore.MonoSqlite.dll")
{
m_configSettings.StorageDll = "OpenSim.Data.SQLite.dll";
Console.WriteLine("WARNING: OpenSim.DataStore.MonoSqlite.dll is deprecated. Set storage_plugin to OpenSim.Data.SQLite.dll.");
m_log.Warn("WARNING: OpenSim.DataStore.MonoSqlite.dll is deprecated. Set storage_plugin to OpenSim.Data.SQLite.dll.");
Thread.Sleep(3000);
}

View File

@@ -192,7 +192,7 @@ namespace OpenSim
for (int i = 3; i < cmdparams.Count; i++)
mapName += " " + cmdparams[i];
Console.WriteLine(">> MapName: " + mapName);
m_log.Info(">> MapName: " + mapName);
//internalPort = Convert.ToUInt32(cmdparams[4]);
//remotingPort = Convert.ToUInt32(cmdparams[5]);
}
@@ -285,7 +285,7 @@ namespace OpenSim
}
catch (Exception e)
{
Console.WriteLine(e.ToString());
m_log.Error(e.ToString());
}
}
@@ -323,9 +323,9 @@ namespace OpenSim
private void LinkRegionCmdUsage()
{
Console.WriteLine("Usage: link-region <Xloc> <Yloc> <HostName>:<HttpPort>[:<RemoteRegionName>]");
Console.WriteLine("Usage: link-region <Xloc> <Yloc> <HostName> <HttpPort> [<LocalName>]");
Console.WriteLine("Usage: link-region <URI_of_xml> [<exclude>]");
m_log.Info("Usage: link-region <Xloc> <Yloc> <HostName>:<HttpPort>[:<RemoteRegionName>]");
m_log.Info("Usage: link-region <Xloc> <Yloc> <HostName> <HttpPort> [<LocalName>]");
m_log.Info("Usage: link-region <URI_of_xml> [<exclude>]");
}
}
}