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

* Replaced old logging mechanism with new shiny logging mechanism 

* Console, I bid thee farewall. Use "Log" now where console used to exist.
Sugilite
Adam Frisby 2007-06-20 15:50:06 +00:00
parent 64ed1e1b3b
commit 29053589bf
30 changed files with 289 additions and 208 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Common/OpenGrid.Framework.UserManager/UserManagerBase.cs
View File

@ -54,10 +54,10 @@ namespace OpenGrid.Framework.UserManagement
/// <param name="FileName">The filename to the user server plugin DLL</param>
public void AddPlugin(string FileName)
{
OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Userstorage: Attempting to load " + FileName);
OpenSim.Framework.Console.MainLog.Instance.Verbose( "Userstorage: Attempting to load " + FileName);
Assembly pluginAssembly = Assembly.LoadFrom(FileName);
OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Userstorage: Found " + pluginAssembly.GetTypes().Length + " interfaces.");
OpenSim.Framework.Console.MainLog.Instance.Verbose( "Userstorage: Found " + pluginAssembly.GetTypes().Length + " interfaces.");
foreach (Type pluginType in pluginAssembly.GetTypes())
{
if (!pluginType.IsAbstract)
@ -69,7 +69,7 @@ namespace OpenGrid.Framework.UserManagement
IUserData plug = (IUserData)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
plug.Initialise();
this._plugins.Add(plug.getName(), plug);
OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Userstorage: Added IUserData Interface");
OpenSim.Framework.Console.MainLog.Instance.Verbose( "Userstorage: Added IUserData Interface");
}
typeInterface = null;
@ -105,7 +105,7 @@ namespace OpenGrid.Framework.UserManagement
}
catch (Exception e)
{
OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
OpenSim.Framework.Console.MainLog.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
}
}
}
@ -127,7 +127,7 @@ namespace OpenGrid.Framework.UserManagement
}
catch (Exception e)
{
OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
OpenSim.Framework.Console.MainLog.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
}
}
@ -152,7 +152,7 @@ namespace OpenGrid.Framework.UserManagement
}
catch (Exception e)
{
OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
OpenSim.Framework.Console.MainLog.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
}
}
@ -184,7 +184,7 @@ namespace OpenGrid.Framework.UserManagement
}
catch (Exception e)
{
OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
OpenSim.Framework.Console.MainLog.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
}
}
@ -206,7 +206,7 @@ namespace OpenGrid.Framework.UserManagement
}
catch (Exception e)
{
OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
OpenSim.Framework.Console.MainLog.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
}
}
@ -228,7 +228,7 @@ namespace OpenGrid.Framework.UserManagement
}
catch (Exception e)
{
OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
OpenSim.Framework.Console.MainLog.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
}
}
@ -251,7 +251,7 @@ namespace OpenGrid.Framework.UserManagement
}
catch (Exception e)
{
OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
OpenSim.Framework.Console.MainLog.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
}
}
@ -336,7 +336,7 @@ namespace OpenGrid.Framework.UserManagement
/// <returns>Authenticated?</returns>
public bool AuthenticateUser(ref UserProfileData profile, string password)
{
OpenSim.Framework.Console.MainConsole.Instance.Verbose(
OpenSim.Framework.Console.MainLog.Instance.Verbose(
"Authenticating " + profile.username + " " + profile.surname);
password = password.Remove(0, 3); //remove $1$

18
Common/OpenSim.Framework.Console/ConsoleBase.cs → Common/OpenSim.Framework.Console/LogBase.cs
View File

@ -41,14 +41,14 @@ namespace OpenSim.Framework.Console
EXTRAVERBOSE
}
public class ConsoleBase
public class LogBase
{
StreamWriter Log;
public conscmd_callback cmdparser;
public string componentname;
private bool m_silent;
public ConsoleBase(string LogFile, string componentname, conscmd_callback cmdparser, bool silent )
public LogBase(string LogFile, string componentname, conscmd_callback cmdparser, bool silent )
{
this.componentname = componentname;
this.cmdparser = cmdparser;
@ -78,18 +78,6 @@ namespace OpenSim.Framework.Console
return;
}
[Obsolete("WriteLine(msg,args) has been depreciated, use WriteLine(priority,msg,args) instead.")]
public void WriteLine(string format, params object[] args)
{
Log.WriteLine(format, args);
Log.Flush();
if (!m_silent)
{
System.Console.WriteLine(format, args);
}
return;
}
public void WriteLine(LogPriority importance, string format, params object[] args)
{
Log.WriteLine(format, args);
@ -226,7 +214,7 @@ namespace OpenSim.Framework.Console
cmdparser.Show(ShowWhat);
}
public void MainConsolePrompt()
public void MainLogPrompt()
{
string[] tempstrarray;
string tempstr = this.CmdPrompt(this.componentname + "# ");

6
Common/OpenSim.Framework.Console/MainConsole.cs → Common/OpenSim.Framework.Console/MainLog.cs
View File

@ -29,11 +29,11 @@ using System;
namespace OpenSim.Framework.Console
{
public class MainConsole {
public class MainLog {
private static ConsoleBase instance;
private static LogBase instance;
public static ConsoleBase Instance
public static LogBase Instance
{
get
{

29
Common/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj
View File

@ -1,4 +1,4 @@
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectType>Local</ProjectType>
<ProductVersion>8.0.50727</ProductVersion>
@ -6,7 +6,8 @@
<ProjectGuid>{A7CD0630-0000-0000-0000-000000000000}</ProjectGuid>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ApplicationIcon></ApplicationIcon>
<ApplicationIcon>
</ApplicationIcon>
<AssemblyKeyContainerName>
</AssemblyKeyContainerName>
<AssemblyName>OpenSim.Framework.Console</AssemblyName>
@ -15,9 +16,11 @@
<DefaultTargetSchema>IE50</DefaultTargetSchema>
<DelaySign>false</DelaySign>
<OutputType>Library</OutputType>
<AppDesignerFolder></AppDesignerFolder>
<AppDesignerFolder>
</AppDesignerFolder>
<RootNamespace>OpenSim.Framework.Console</RootNamespace>
<StartupObject></StartupObject>
<StartupObject>
</StartupObject>
<FileUpgradeFlags>
</FileUpgradeFlags>
</PropertyGroup>
@ -28,7 +31,8 @@
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
<DefineConstants>TRACE;DEBUG</DefineConstants>
<DocumentationFile></DocumentationFile>
<DocumentationFile>
</DocumentationFile>
<DebugSymbols>True</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<Optimize>False</Optimize>
@ -37,7 +41,8 @@
<RemoveIntegerChecks>False</RemoveIntegerChecks>
<TreatWarningsAsErrors>False</TreatWarningsAsErrors>
<WarningLevel>4</WarningLevel>
<NoWarn></NoWarn>
<NoWarn>
</NoWarn>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<AllowUnsafeBlocks>False</AllowUnsafeBlocks>
@ -46,7 +51,8 @@
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
<DefineConstants>TRACE</DefineConstants>
<DocumentationFile></DocumentationFile>
<DocumentationFile>
</DocumentationFile>
<DebugSymbols>False</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<Optimize>True</Optimize>
@ -55,10 +61,11 @@
<RemoveIntegerChecks>False</RemoveIntegerChecks>
<TreatWarningsAsErrors>False</TreatWarningsAsErrors>
<WarningLevel>4</WarningLevel>
<NoWarn></NoWarn>
<NoWarn>
</NoWarn>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" >
<Reference Include="System">
<HintPath>System.dll</HintPath>
<Private>False</Private>
</Reference>
@ -69,13 +76,13 @@
<Compile Include="AssemblyInfo.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="ConsoleBase.cs">
<Compile Include="LogBase.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="ConsoleCallbacksBase.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="MainConsole.cs">
<Compile Include="MainLog.cs">
<SubType>Code</SubType>
</Compile>
</ItemGroup>

12
Common/OpenSim.Framework/Types/NetworkServersInfo.cs
View File

@ -59,7 +59,7 @@ namespace OpenSim.Framework.Types
attri = configData.GetAttribute("GridServerURL");
if (attri == "")
{
this.GridURL = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Grid server URL", "http://127.0.0.1:8001/");
this.GridURL = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Grid server URL", "http://127.0.0.1:8001/");
configData.SetAttribute("GridServerURL", this.GridURL);
}
else
@ -72,7 +72,7 @@ namespace OpenSim.Framework.Types
attri = configData.GetAttribute("GridSendKey");
if (attri == "")
{
this.GridSendKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to send to grid server", "null");
this.GridSendKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to send to grid server", "null");
configData.SetAttribute("GridSendKey", this.GridSendKey);
}
else
@ -85,7 +85,7 @@ namespace OpenSim.Framework.Types
attri = configData.GetAttribute("GridRecvKey");
if (attri == "")
{
this.GridRecvKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to expect from grid server", "null");
this.GridRecvKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to expect from grid server", "null");
configData.SetAttribute("GridRecvKey", this.GridRecvKey);
}
else
@ -97,7 +97,7 @@ namespace OpenSim.Framework.Types
attri = configData.GetAttribute("AssetServerURL");
if (attri == "")
{
this.AssetURL = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Asset server URL", "http://127.0.0.1:8003/");
this.AssetURL = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Asset server URL", "http://127.0.0.1:8003/");
configData.SetAttribute("AssetServerURL", this.GridURL);
}
else
@ -110,8 +110,8 @@ namespace OpenSim.Framework.Types
}
catch (Exception e)
{
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "Config.cs:InitConfig() - Exception occured");
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, e.ToString());
OpenSim.Framework.Console.MainLog.Instance.Warn("Config.cs:InitConfig() - Exception occured");
OpenSim.Framework.Console.MainLog.Instance.Warn(e.ToString());
}
}
}

40
Common/OpenSim.Framework/Types/RegionInfo.cs
View File

@ -87,7 +87,7 @@ namespace OpenSim.Framework.Types
attri = configData.GetAttribute("SimName");
if (attri == "")
{
this.RegionName = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Name", "OpenSim test");
this.RegionName = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Name", "OpenSim test");
configData.SetAttribute("SimName", this.RegionName);
}
else
@ -99,7 +99,7 @@ namespace OpenSim.Framework.Types
attri = configData.GetAttribute("SimLocationX");
if (attri == "")
{
string location = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Grid Location X", "997");
string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Grid Location X", "997");
configData.SetAttribute("SimLocationX", location);
this.RegionLocX = (uint)Convert.ToUInt32(location);
}
@ -112,7 +112,7 @@ namespace OpenSim.Framework.Types
attri = configData.GetAttribute("SimLocationY");
if (attri == "")
{
string location = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Grid Location Y", "996");
string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Grid Location Y", "996");
configData.SetAttribute("SimLocationY", location);
this.RegionLocY = (uint)Convert.ToUInt32(location);
}
@ -126,7 +126,7 @@ namespace OpenSim.Framework.Types
attri = configData.GetAttribute("Datastore");
if (attri == "")
{
string datastore = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Filename for local storage", "localworld.yap");
string datastore = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Filename for local storage", "localworld.yap");
configData.SetAttribute("Datastore", datastore);
this.DataStore = datastore;
}
@ -140,7 +140,7 @@ namespace OpenSim.Framework.Types
attri = configData.GetAttribute("SimListenPort");
if (attri == "")
{
string port = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("UDP port for client connections", "9000");
string port = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("UDP port for client connections", "9000");
configData.SetAttribute("SimListenPort", port);
this.IPListenPort = Convert.ToInt32(port);
}
@ -154,7 +154,7 @@ namespace OpenSim.Framework.Types
attri = configData.GetAttribute("SimListenAddress");
if (attri == "")
{
this.IPListenAddr = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("IP Address to listen on for client connections", "127.0.0.1");
this.IPListenAddr = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("IP Address to listen on for client connections", "127.0.0.1");
configData.SetAttribute("SimListenAddress", this.IPListenAddr);
}
else
@ -184,7 +184,7 @@ namespace OpenSim.Framework.Types
attri = configData.GetAttribute("TerrainFile");
if (attri == "")
{
this.estateSettings.terrainFile = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("GENERAL SETTING: Default Terrain File", "default.r32");
this.estateSettings.terrainFile = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("GENERAL SETTING: Default Terrain File", "default.r32");
configData.SetAttribute("TerrainFile", this.estateSettings.terrainFile);
}
else
@ -196,7 +196,7 @@ namespace OpenSim.Framework.Types
attri = configData.GetAttribute("TerrainMultiplier");
if (attri == "")
{
string re = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("GENERAL SETTING: Terrain Height Multiplier", "60.0");
string re = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("GENERAL SETTING: Terrain Height Multiplier", "60.0");
this.estateSettings.terrainMultiplier = Convert.ToDouble(re, CultureInfo.InvariantCulture);
configData.SetAttribute("TerrainMultiplier", this.estateSettings.terrainMultiplier.ToString());
}
@ -209,7 +209,7 @@ namespace OpenSim.Framework.Types
attri = configData.GetAttribute("MasterAvatarFirstName");
if (attri == "")
{
this.MasterAvatarFirstName = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("First name of Master Avatar (Land and Region Owner)", "Test");
this.MasterAvatarFirstName = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("First name of Master Avatar (Land and Region Owner)", "Test");
configData.SetAttribute("MasterAvatarFirstName", this.MasterAvatarFirstName);
}
@ -222,7 +222,7 @@ namespace OpenSim.Framework.Types
attri = configData.GetAttribute("MasterAvatarLastName");
if (attri == "")
{
this.MasterAvatarLastName = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Last name of Master Avatar (Land and Region Owner)", "User");
this.MasterAvatarLastName = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Last name of Master Avatar (Land and Region Owner)", "User");
configData.SetAttribute("MasterAvatarLastName", this.MasterAvatarLastName);
}
@ -237,7 +237,7 @@ namespace OpenSim.Framework.Types
attri = configData.GetAttribute("MasterAvatarSandboxPassword");
if (attri == "")
{
this.MasterAvatarSandboxPassword = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Password of Master Avatar (Needed for sandbox mode account creation only)", "test");
this.MasterAvatarSandboxPassword = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Password of Master Avatar (Needed for sandbox mode account creation only)", "test");
//Should I store this?
configData.SetAttribute("MasterAvatarSandboxPassword", this.MasterAvatarSandboxPassword);
@ -254,17 +254,17 @@ namespace OpenSim.Framework.Types
}
catch (Exception e)
{
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,"Config.cs:InitConfig() - Exception occured");
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,e.ToString());
OpenSim.Framework.Console.MainLog.Instance.Warn("Config.cs:InitConfig() - Exception occured");
OpenSim.Framework.Console.MainLog.Instance.Warn(e.ToString());
}
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Sim settings loaded:");
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "UUID: " + this.SimUUID.ToStringHyphenated());
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Name: " + this.RegionName);
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Region Location: [" + this.RegionLocX.ToString() + "," + this.RegionLocY + "]");
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Region Handle: " + this.RegionHandle.ToString());
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Listening on IP: " + this.IPListenAddr + ":" + this.IPListenPort);
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Sandbox Mode? " + isSandbox.ToString());
OpenSim.Framework.Console.MainLog.Instance.Verbose("Sim settings loaded:");
OpenSim.Framework.Console.MainLog.Instance.Verbose( "UUID: " + this.SimUUID.ToStringHyphenated());
OpenSim.Framework.Console.MainLog.Instance.Verbose( "Name: " + this.RegionName);
OpenSim.Framework.Console.MainLog.Instance.Verbose( "Region Location: [" + this.RegionLocX.ToString() + "," + this.RegionLocY + "]");
OpenSim.Framework.Console.MainLog.Instance.Verbose( "Region Handle: " + this.RegionHandle.ToString());
OpenSim.Framework.Console.MainLog.Instance.Verbose( "Listening on IP: " + this.IPListenAddr + ":" + this.IPListenPort);
OpenSim.Framework.Console.MainLog.Instance.Verbose( "Sandbox Mode? " + isSandbox.ToString());
}
}

6
Common/OpenSim.Servers/BaseHttpServer.cs
View File

@ -250,7 +250,7 @@ namespace OpenSim.Servers
public void Start()
{
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.LOW, "BaseHttpServer.cs: Starting up HTTP Server");
OpenSim.Framework.Console.MainLog.Instance.WriteLine(LogPriority.LOW, "BaseHttpServer.cs: Starting up HTTP Server");
m_workerThread = new Thread(new ThreadStart(StartHTTP));
m_workerThread.IsBackground = true;
@ -261,7 +261,7 @@ namespace OpenSim.Servers
{
try
{
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.LOW, "BaseHttpServer.cs: StartHTTP() - Spawned main thread OK");
OpenSim.Framework.Console.MainLog.Instance.WriteLine(LogPriority.LOW, "BaseHttpServer.cs: StartHTTP() - Spawned main thread OK");
m_httpListener = new HttpListener();
m_httpListener.Prefixes.Add("http://+:" + m_port + "/");
@ -276,7 +276,7 @@ namespace OpenSim.Servers
}
catch (Exception e)
{
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.MEDIUM, e.Message);
OpenSim.Framework.Console.MainLog.Instance.WriteLine(LogPriority.MEDIUM, e.Message);
}
}
}

4
Common/OpenSim.Servers/CheckSumServer.cs
View File

@ -44,7 +44,7 @@ namespace OpenSim.Servers
{
public class CheckSumServer : UDPServerBase
{
//protected ConsoleBase m_console;
//protected ConsoleBase m_log;
public CheckSumServer(int port)
: base(port)
@ -127,7 +127,7 @@ namespace OpenSim.Servers
}
catch (Exception)
{
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "OpenSimClient.cs:ProcessOutPacket() - WARNING: Socket exception occurred on connection ");
OpenSim.Framework.Console.MainLog.Instance.Warn("OpenSimClient.cs:ProcessOutPacket() - WARNING: Socket exception occurred on connection ");
}
}

4
Common/OpenSim.Servers/LoginResponse.cs
View File

@ -211,7 +211,7 @@ namespace OpenSim.UserServer
}
catch (Exception e)
{
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(
OpenSim.Framework.Console.MainLog.Instance.WriteLine(
OpenSim.Framework.Console.LogPriority.LOW,
"LoginResponse: Unable to set default values: " + e.Message
);
@ -327,7 +327,7 @@ namespace OpenSim.UserServer
}
catch (Exception e)
{
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(
OpenSim.Framework.Console.MainLog.Instance.WriteLine(
OpenSim.Framework.Console.LogPriority.LOW,
"LoginResponse: Error creating XML-RPC Response: " + e.Message
);

12
OpenSim/OpenSim.GridInterfaces/Local/LocalAssetServer.cs
View File

@ -66,17 +66,17 @@ namespace OpenSim.GridInterfaces.Local
this._assetRequests = new BlockingQueue<ARequest>();
yapfile = System.IO.File.Exists("assets.yap");
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.VERBOSE, "Local Asset Server class created");
OpenSim.Framework.Console.MainLog.Instance.Verbose( "Local Asset Server class created");
try
{
db = Db4oFactory.OpenFile("assets.yap");
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.VERBOSE, "Db4 Asset database creation");
OpenSim.Framework.Console.MainLog.Instance.Verbose( "Db4 Asset database creation");
}
catch (Exception e)
{
db.Close();
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.MEDIUM, "Db4 Asset server :Constructor - Exception occured");
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, e.ToString());
OpenSim.Framework.Console.MainLog.Instance.WriteLine(LogPriority.MEDIUM, "Db4 Asset server :Constructor - Exception occured");
OpenSim.Framework.Console.MainLog.Instance.Warn(e.ToString());
}
if (!yapfile)
{
@ -124,7 +124,7 @@ namespace OpenSim.GridInterfaces.Local
{
if (db != null)
{
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.VERBOSE, "Closing local asset server database");
OpenSim.Framework.Console.MainLog.Instance.Verbose( "Closing local asset server database");
db.Close();
}
}
@ -168,7 +168,7 @@ namespace OpenSim.GridInterfaces.Local
try
{
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.VERBOSE, "Setting up asset database");
OpenSim.Framework.Console.MainLog.Instance.Verbose( "Setting up asset database");
AssetBase Image = new AssetBase();
Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000001");

4
OpenSim/OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs
View File

@ -53,7 +53,7 @@ namespace OpenSim.GridInterfaces.Remote
this._remoteAssetServerThread = new Thread(new ThreadStart(RunRequests));
this._remoteAssetServerThread.IsBackground = true;
this._remoteAssetServerThread.Start();
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Remote Asset Server class created");
OpenSim.Framework.Console.MainLog.Instance.Verbose("Remote Asset Server class created");
}
public void SetReceiver(IAssetReceiver receiver)
@ -98,7 +98,7 @@ namespace OpenSim.GridInterfaces.Remote
// 404... THE MAGIC FILE NOT FOUND ERROR, very useful for telling you things such as a file (or asset ;) ) not being found!!!!!!!!!!! it's 2:22AM
ARequest req = this._assetRequests.Dequeue();
LLUUID assetID = req.AssetID;
// OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW," RemoteAssetServer- Got a AssetServer request, processing it - " + this.AssetServerUrl + "assets/" + assetID);
// OpenSim.Framework.Console.MainLog.Instance.Verbose(" RemoteAssetServer- Got a AssetServer request, processing it - " + this.AssetServerUrl + "assets/" + assetID);
WebRequest AssetLoad = WebRequest.Create(this.AssetServerUrl + "assets/" + assetID);
WebResponse AssetResponse = AssetLoad.GetResponse();
byte[] idata = new byte[(int)AssetResponse.ContentLength];

4
OpenSim/OpenSim.Physics/Manager/PhysicsManager.cs
View File

@ -56,12 +56,12 @@ namespace OpenSim.Physics.Manager
if(_plugins.ContainsKey(engineName))
{
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.LOW,"creating "+engineName);
OpenSim.Framework.Console.MainLog.Instance.WriteLine(LogPriority.LOW,"creating "+engineName);
return _plugins[engineName].GetScene();
}
else
{
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.MEDIUM,"couldn't find physicsEngine: {0}",engineName);
OpenSim.Framework.Console.MainLog.Instance.WriteLine(LogPriority.MEDIUM,"couldn't find physicsEngine: {0}",engineName);
throw new ArgumentException(String.Format("couldn't find physicsEngine: {0}",engineName));
}
}

10
OpenSim/OpenSim.Physics/Manager/PhysicsScene.cs
View File

@ -68,7 +68,7 @@ namespace OpenSim.Physics.Manager
public override PhysicsActor AddAvatar(PhysicsVector position)
{
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.VERBOSE,"NullPhysicsScene : AddAvatar({0})", position);
OpenSim.Framework.Console.MainLog.Instance.Verbose("NullPhysicsScene : AddAvatar({0})", position);
return PhysicsActor.Null;
}
@ -79,7 +79,7 @@ namespace OpenSim.Physics.Manager
public override PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size)
{
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.VERBOSE, "NullPhysicsScene : AddPrim({0},{1})", position, size);
OpenSim.Framework.Console.MainLog.Instance.Verbose( "NullPhysicsScene : AddPrim({0},{1})", position, size);
return PhysicsActor.Null;
}
@ -87,17 +87,17 @@ namespace OpenSim.Physics.Manager
{
m_workIndicator = (m_workIndicator + 1) % 10;
//OpenSim.Framework.Console.MainConsole.Instance.SetStatus(m_workIndicator.ToString());
//OpenSim.Framework.Console.MainLog.Instance.SetStatus(m_workIndicator.ToString());
}
public override void GetResults()
{
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.VERBOSE, "NullPhysicsScene : GetResults()");
OpenSim.Framework.Console.MainLog.Instance.Verbose( "NullPhysicsScene : GetResults()");
}
public override void SetTerrain(float[] heightMap)
{
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.VERBOSE, "NullPhysicsScene : SetTerrain({0} items)", heightMap.Length);
OpenSim.Framework.Console.MainLog.Instance.Verbose( "NullPhysicsScene : SetTerrain({0} items)", heightMap.Length);
}
public override void DeleteTerrain()

6
OpenSim/OpenSim.Region/EstateManager.cs
View File

@ -79,7 +79,7 @@ namespace OpenSim.Region
case "setregioninfo":
if (packet.ParamList.Length != 9)
{
OpenSim.Framework.Console.MainConsole.Instance.Error("EstateOwnerMessage: SetRegionInfo method has a ParamList of invalid length");
OpenSim.Framework.Console.MainLog.Instance.Error("EstateOwnerMessage: SetRegionInfo method has a ParamList of invalid length");
}
else
{
@ -223,7 +223,7 @@ namespace OpenSim.Region
case "setregionterrain":
if (packet.ParamList.Length != 9)
{
OpenSim.Framework.Console.MainConsole.Instance.Error("EstateOwnerMessage: SetRegionTerrain method has a ParamList of invalid length");
OpenSim.Framework.Console.MainLog.Instance.Error("EstateOwnerMessage: SetRegionTerrain method has a ParamList of invalid length");
}
else
{
@ -237,7 +237,7 @@ namespace OpenSim.Region
}
break;
default:
OpenSim.Framework.Console.MainConsole.Instance.Error("EstateOwnerMessage: Unknown method requested\n" + packet.ToString());
OpenSim.Framework.Console.MainLog.Instance.Error("EstateOwnerMessage: Unknown method requested\n" + packet.ToString());
break;
}
}

4
OpenSim/OpenSim.Region/Scenes/Avatar.Animations.cs
View File

@ -47,7 +47,7 @@ namespace OpenSim.Region.Scenes
public void LoadAnims()
{
//OpenSim.Framework.Console.MainConsole.Instance.Verbose("Avatar.cs:LoadAnims() - Loading avatar animations");
//OpenSim.Framework.Console.MainLog.Instance.Verbose("Avatar.cs:LoadAnims() - Loading avatar animations");
XmlTextReader reader = new XmlTextReader("data/avataranimations.xml");
XmlDocument doc = new XmlDocument();
@ -64,7 +64,7 @@ namespace OpenSim.Region.Scenes
reader.Close();
// OpenSim.Framework.Console.MainConsole.Instance.Verbose("Loaded " + AnimsLLUUID.Count.ToString() + " animation(s)");
// OpenSim.Framework.Console.MainLog.Instance.Verbose("Loaded " + AnimsLLUUID.Count.ToString() + " animation(s)");
foreach (KeyValuePair<string, LLUUID> kp in OpenSim.Region.Scenes.Avatar.Animations.AnimsLLUUID)
{

2
OpenSim/OpenSim.Region/Scenes/Avatar.cs
View File

@ -78,7 +78,7 @@ namespace OpenSim.Region.Scenes
m_regionInfo = reginfo;
m_regionHandle = reginfo.RegionHandle;
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Avatar.cs - Loading details from grid (DUMMY)");
OpenSim.Framework.Console.MainLog.Instance.Verbose( "Avatar.cs - Loading details from grid (DUMMY)");
ControllingClient = theClient;
this.firstname = ControllingClient.FirstName;
this.lastname = ControllingClient.LastName;

44
OpenSim/OpenSim.Region/Scenes/Scene.cs
View File

@ -117,12 +117,12 @@ namespace OpenSim.Region.Scenes
m_scriptHandlers = new Dictionary<LLUUID, ScriptHandler>();
m_scripts = new Dictionary<string, ScriptFactory>();
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs - creating new entitities instance");
OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs - creating new entitities instance");
Entities = new Dictionary<libsecondlife.LLUUID, Entity>();
Avatars = new Dictionary<LLUUID, Avatar>();
Prims = new Dictionary<LLUUID, Primitive>();
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs - creating LandMap");
OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs - creating LandMap");
TerrainManager = new TerrainManager(new SecondLife());
Terrain = new TerrainEngine();
@ -130,7 +130,7 @@ namespace OpenSim.Region.Scenes
}
catch (Exception e)
{
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.CRITICAL, "World.cs: Constructor failed with exception " + e.ToString());
OpenSim.Framework.Console.MainLog.Instance.Error( "World.cs: Constructor failed with exception " + e.ToString());
}
}
#endregion
@ -206,7 +206,7 @@ namespace OpenSim.Region.Scenes
}
catch (Exception e)
{
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: Update() - Failed with exception " + e.ToString());
OpenSim.Framework.Console.MainLog.Instance.Warn("World.cs: Update() - Failed with exception " + e.ToString());
}
updateLock.ReleaseMutex();
@ -225,9 +225,9 @@ namespace OpenSim.Region.Scenes
if (Terrain.tainted > 0)
{
Terrain.tainted = 0;
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs: Backup() - Terrain tainted, saving.");
OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs: Backup() - Terrain tainted, saving.");
localStorage.SaveMap(Terrain.getHeights1D());
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs: Backup() - Terrain saved, informing Physics.");
OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs: Backup() - Terrain saved, informing Physics.");
lock (this.m_syncRoot)
{
phyScene.SetTerrain(Terrain.getHeights1D());
@ -235,7 +235,7 @@ namespace OpenSim.Region.Scenes
}
// Primitive backup routines
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs: Backup() - Backing up Primitives");
OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs: Backup() - Backing up Primitives");
foreach (libsecondlife.LLUUID UUID in Entities.Keys)
{
Entities[UUID].BackUp();
@ -257,7 +257,7 @@ namespace OpenSim.Region.Scenes
catch (Exception e)
{
// Backup failed
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, "World.cs: Backup() - Backup Failed with exception " + e.ToString());
OpenSim.Framework.Console.MainLog.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, "World.cs: Backup() - Backup Failed with exception " + e.ToString());
return false;
}
*/
@ -305,7 +305,7 @@ namespace OpenSim.Region.Scenes
}
catch (Exception e)
{
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: LoadStorageDLL() - Failed with exception " + e.ToString());
OpenSim.Framework.Console.MainLog.Instance.Warn("World.cs: LoadStorageDLL() - Failed with exception " + e.ToString());
return false;
}
}
@ -341,7 +341,7 @@ namespace OpenSim.Region.Scenes
}
catch (Exception e)
{
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: RegenerateTerrain() - Failed with exception " + e.ToString());
OpenSim.Framework.Console.MainLog.Instance.Warn("World.cs: RegenerateTerrain() - Failed with exception " + e.ToString());
}
}
@ -372,7 +372,7 @@ namespace OpenSim.Region.Scenes
}
catch (Exception e)
{
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: RegenerateTerrain() - Failed with exception " + e.ToString());
OpenSim.Framework.Console.MainLog.Instance.Warn("World.cs: RegenerateTerrain() - Failed with exception " + e.ToString());
}
}
@ -398,7 +398,7 @@ namespace OpenSim.Region.Scenes
}
catch (Exception e)
{
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: RegenerateTerrain() - Failed with exception " + e.ToString());
OpenSim.Framework.Console.MainLog.Instance.Warn("World.cs: RegenerateTerrain() - Failed with exception " + e.ToString());
}
}
@ -451,7 +451,7 @@ namespace OpenSim.Region.Scenes
}
catch (Exception e)
{
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: LoadWorldMap() - Failed with exception " + e.ToString());
OpenSim.Framework.Console.MainLog.Instance.Warn("World.cs: LoadWorldMap() - Failed with exception " + e.ToString());
}
}
@ -483,12 +483,12 @@ namespace OpenSim.Region.Scenes
{
try
{
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs: LoadPrimsFromStorage() - Loading primitives");
OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs: LoadPrimsFromStorage() - Loading primitives");
this.localStorage.LoadPrimitives(this);
}
catch (Exception e)
{
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: LoadPrimsFromStorage() - Failed with exception " + e.ToString());
OpenSim.Framework.Console.MainLog.Instance.Warn("World.cs: LoadPrimsFromStorage() - Failed with exception " + e.ToString());
}
}
@ -520,7 +520,7 @@ namespace OpenSim.Region.Scenes
{
try
{
// MainConsole.Instance.Notice("World.cs: AddNewPrim() - Creating new prim");
// MainLog.Instance.Notice("World.cs: AddNewPrim() - Creating new prim");
Primitive prim = new Primitive(m_regionHandle, this, addPacket, ownerID, this._primCount);
this.Entities.Add(prim.uuid, prim);
@ -528,7 +528,7 @@ namespace OpenSim.Region.Scenes
}
catch (Exception e)
{
// MainConsole.Instance.Warn("World.cs: AddNewPrim() - Failed with exception " + e.ToString());
// MainLog.Instance.Warn("World.cs: AddNewPrim() - Failed with exception " + e.ToString());
}
}
@ -563,10 +563,10 @@ namespace OpenSim.Region.Scenes
Avatar newAvatar = null;
try
{
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs:AddViewerAgent() - Creating new avatar for remote viewer agent");
OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs:AddViewerAgent() - Creating new avatar for remote viewer agent");
newAvatar = new Avatar(remoteClient, this, this.m_regInfo);
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs:AddViewerAgent() - Adding new avatar to world");
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs:AddViewerAgent() - Starting RegionHandshake ");
OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs:AddViewerAgent() - Adding new avatar to world");
OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs:AddViewerAgent() - Starting RegionHandshake ");
//newAvatar.SendRegionHandshake();
this.estateManager.sendRegionHandshake(remoteClient);
@ -602,7 +602,7 @@ namespace OpenSim.Region.Scenes
}
catch (Exception e)
{
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: AddViewerAgent() - Failed with exception " + e.ToString());
OpenSim.Framework.Console.MainLog.Instance.Warn("World.cs: AddViewerAgent() - Failed with exception " + e.ToString());
}
return;
}
@ -685,7 +685,7 @@ namespace OpenSim.Region.Scenes
}
catch (Exception e)
{
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, "World.cs: Close() - Failed with exception " + e.ToString());
OpenSim.Framework.Console.MainLog.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, "World.cs: Close() - Failed with exception " + e.ToString());
}
}
#endregion

4
OpenSim/OpenSim.RegionServer/ClientView.API.cs
View File

@ -245,7 +245,7 @@ namespace OpenSim
}
catch (Exception e)
{
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "ClientView API.cs: SendLayerData() - Failed with exception " + e.ToString());
OpenSim.Framework.Console.MainLog.Instance.Warn("ClientView API.cs: SendLayerData() - Failed with exception " + e.ToString());
}
}
@ -271,7 +271,7 @@ namespace OpenSim
}
catch (Exception e)
{
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "ClientView API .cs: SendLayerData() - Failed with exception " + e.ToString());
OpenSim.Framework.Console.MainLog.Instance.Warn("ClientView API .cs: SendLayerData() - Failed with exception " + e.ToString());
}
}

2
OpenSim/OpenSim.RegionServer/ClientView.PacketHandlers.cs
View File

@ -55,7 +55,7 @@ namespace OpenSim
protected virtual bool Logout(ClientView simClient, Packet packet)
{
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "OpenSimClient.cs:ProcessInPacket() - Got a logout request");
OpenSim.Framework.Console.MainLog.Instance.Verbose( "OpenSimClient.cs:ProcessInPacket() - Got a logout request");
//send reply to let the client logout
LogoutReplyPacket logReply = new LogoutReplyPacket();
logReply.AgentData.AgentID = this.AgentID;

4
OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs
View File

@ -191,7 +191,7 @@ namespace OpenSim
#region Objects/Prims
case PacketType.ObjectLink:
// OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, Pack.ToString());
// OpenSim.Framework.Console.MainLog.Instance.Verbose( Pack.ToString());
ObjectLinkPacket link = (ObjectLinkPacket)Pack;
uint parentprimid = 0;
List<uint> childrenprims = new List<uint>();
@ -514,7 +514,7 @@ namespace OpenSim
//Console.WriteLine(Pack.ToString());
break;
case PacketType.ObjectScale:
//OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, Pack.ToString());
//OpenSim.Framework.Console.MainLog.Instance.Verbose( Pack.ToString());
break;
#endregion
}

10
OpenSim/OpenSim.RegionServer/ClientView.cs
View File

@ -90,7 +90,7 @@ namespace OpenSim
m_inventoryCache = inventoryCache;
m_authenticateSessionsHandler = authenSessions;
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "OpenSimClient.cs - Started up new client thread to handle incoming request");
OpenSim.Framework.Console.MainLog.Instance.Verbose( "OpenSimClient.cs - Started up new client thread to handle incoming request");
cirpack = initialcirpack;
userEP = remoteEP;
@ -188,7 +188,7 @@ namespace OpenSim
protected virtual void ClientLoop()
{
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "OpenSimClient.cs:ClientLoop() - Entered loop");
OpenSim.Framework.Console.MainLog.Instance.Verbose( "OpenSimClient.cs:ClientLoop() - Entered loop");
while (true)
{
QueItem nextPacket = PacketQueue.Dequeue();
@ -210,7 +210,7 @@ namespace OpenSim
protected virtual void InitNewClient()
{
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "OpenSimClient.cs:InitNewClient() - Adding viewer agent to world");
OpenSim.Framework.Console.MainLog.Instance.Verbose( "OpenSimClient.cs:InitNewClient() - Adding viewer agent to world");
this.m_world.AddNewAvatar(this, this.AgentID, false);
}
@ -221,12 +221,12 @@ namespace OpenSim
if (!sessionInfo.Authorised)
{
//session/circuit not authorised
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.NORMAL, "OpenSimClient.cs:AuthUser() - New user request denied to " + userEP.ToString());
OpenSim.Framework.Console.MainLog.Instance.Notice("OpenSimClient.cs:AuthUser() - New user request denied to " + userEP.ToString());
ClientThread.Abort();
}
else
{
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.NORMAL, "OpenSimClient.cs:AuthUser() - Got authenticated connection from " + userEP.ToString());
OpenSim.Framework.Console.MainLog.Instance.Notice("OpenSimClient.cs:AuthUser() - Got authenticated connection from " + userEP.ToString());
//session is authorised
this.AgentID = cirpack.CircuitCode.ID;
this.SessionID = cirpack.CircuitCode.SessionID;

8
OpenSim/OpenSim.RegionServer/ClientViewBase.cs
View File

@ -159,7 +159,7 @@ namespace OpenSim
}
catch (Exception)
{
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "OpenSimClient.cs:ProcessOutPacket() - WARNING: Socket exception occurred on connection " + userEP.ToString() + " - killing thread");
OpenSim.Framework.Console.MainLog.Instance.Warn("OpenSimClient.cs:ProcessOutPacket() - WARNING: Socket exception occurred on connection " + userEP.ToString() + " - killing thread");
this.KillThread();
}
@ -254,7 +254,7 @@ namespace OpenSim
{
if ((now - packet.TickCount > RESEND_TIMEOUT) && (!packet.Header.Resent))
{
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.VERBOSE, "Resending " + packet.Type.ToString() + " packet, " +
OpenSim.Framework.Console.MainLog.Instance.Verbose( "Resending " + packet.Type.ToString() + " packet, " +
(now - packet.TickCount) + "ms have passed");
packet.Header.Resent = true;
@ -273,11 +273,11 @@ namespace OpenSim
if (PendingAcks.Count > 250)
{
// FIXME: Handle the odd case where we have too many pending ACKs queued up
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.VERBOSE, "Too many ACKs queued up!");
OpenSim.Framework.Console.MainLog.Instance.Verbose( "Too many ACKs queued up!");
return;
}
//OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Sending PacketAck");
//OpenSim.Framework.Console.MainLog.Instance.WriteLine("Sending PacketAck");
int i = 0;

12
OpenSim/OpenSim.RegionServer/NetworkServersInfo.cs
View File

@ -60,7 +60,7 @@ namespace OpenSim
attri = configData.GetAttribute("GridServerURL");
if (attri == "")
{
this.GridURL = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Grid server URL", "http://127.0.0.1:8001/");
this.GridURL = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Grid server URL", "http://127.0.0.1:8001/");
configData.SetAttribute("GridServerURL", this.GridURL);
}
else
@ -73,7 +73,7 @@ namespace OpenSim
attri = configData.GetAttribute("GridSendKey");
if (attri == "")
{
this.GridSendKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to send to grid server", "null");
this.GridSendKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to send to grid server", "null");
configData.SetAttribute("GridSendKey", this.GridSendKey);
}
else
@ -86,7 +86,7 @@ namespace OpenSim
attri = configData.GetAttribute("GridRecvKey");
if (attri == "")
{
this.GridRecvKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to expect from grid server", "null");
this.GridRecvKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to expect from grid server", "null");
configData.SetAttribute("GridRecvKey", this.GridRecvKey);
}
else
@ -98,7 +98,7 @@ namespace OpenSim
attri = configData.GetAttribute("AssetServerURL");
if (attri == "")
{
this.AssetURL = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Asset server URL", "http://127.0.0.1:8003/");
this.AssetURL = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Asset server URL", "http://127.0.0.1:8003/");
configData.SetAttribute("AssetServerURL", this.GridURL);
}
else
@ -111,8 +111,8 @@ namespace OpenSim
}
catch (Exception e)
{
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "Config.cs:InitConfig() - Exception occured");
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, e.ToString());
OpenSim.Framework.Console.MainLog.Instance.Warn("Config.cs:InitConfig() - Exception occured");
OpenSim.Framework.Console.MainLog.Instance.Warn(e.ToString());
}
}
}

2
OpenSim/OpenSim.RegionServer/RegionApplicationBase.cs
View File

@ -76,7 +76,7 @@ namespace OpenSim
protected BaseHttpServer httpServer;
protected List<AuthenticateSessionsBase> AuthenticateSessionsHandler = new List<AuthenticateSessionsBase>();
protected ConsoleBase m_console;
protected LogBase m_log;
public RegionApplicationBase()
{

14
OpenSim/OpenSim.RegionServer/UDPServer.cs
View File

@ -68,7 +68,7 @@ namespace OpenSim
protected IWorld m_localWorld;
protected AssetCache m_assetCache;
protected InventoryCache m_inventoryCache;
protected ConsoleBase m_console;
protected LogBase m_log;
protected AuthenticateSessionsBase m_authenticateSessionsClass;
public PacketServer PacketServer
@ -96,12 +96,12 @@ namespace OpenSim
{
}
public UDPServer(int port, AssetCache assetCache, InventoryCache inventoryCache, ConsoleBase console, AuthenticateSessionsBase authenticateClass)
public UDPServer(int port, AssetCache assetCache, InventoryCache inventoryCache, LogBase console, AuthenticateSessionsBase authenticateClass)
{
listenPort = port;
this.m_assetCache = assetCache;
this.m_inventoryCache = inventoryCache;
this.m_console = console;
this.m_log = console;
this.m_authenticateSessionsClass = authenticateClass;
this.CreatePacketServer();
@ -135,7 +135,7 @@ namespace OpenSim
}
else
{ // invalid client
Console.Error.WriteLine("UDPServer.cs:OnReceivedData() - WARNING: Got a packet from an invalid client - " + epSender.ToString());
m_log.Warn("UDPServer.cs:OnReceivedData() - WARNING: Got a packet from an invalid client - " + epSender.ToString());
}
Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null);
@ -151,20 +151,20 @@ namespace OpenSim
public void ServerListener()
{
m_console.WriteLine(LogPriority.LOW, "UDPServer.cs:ServerListener() - Opening UDP socket on " + listenPort);
m_log.Status("UDPServer.cs:ServerListener() - Opening UDP socket on " + listenPort);
ServerIncoming = new IPEndPoint(IPAddress.Any, listenPort);
Server = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp);
Server.Bind(ServerIncoming);
m_console.WriteLine(LogPriority.LOW, "UDPServer.cs:ServerListener() - UDP socket bound, getting ready to listen");
m_log.Verbose("UDPServer.cs:ServerListener() - UDP socket bound, getting ready to listen");
ipeSender = new IPEndPoint(IPAddress.Any, 0);
epSender = (EndPoint)ipeSender;
ReceivedData = new AsyncCallback(this.OnReceivedData);
Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null);
m_console.WriteLine(LogPriority.LOW, "UDPServer.cs:ServerListener() - Listening...");
m_log.Verbose("UDPServer.cs:ServerListener() - Listening...");
}

32
OpenSim/OpenSim.Storage/LocalStorageDb4o/Db4LocalStorage.cs
View File

@ -53,18 +53,18 @@ namespace OpenSim.Storage.LocalStorageDb4o
public void Initialise(string dfile)
{
OpenSim.Framework.Console.MainConsole.Instance.Warn("Db4LocalStorage Opening " + dfile);
OpenSim.Framework.Console.MainLog.Instance.Warn("Db4LocalStorage Opening " + dfile);
datastore = dfile;
try
{
db = Db4oFactory.OpenFile(datastore);
OpenSim.Framework.Console.MainConsole.Instance.Verbose("Db4LocalStorage creation");
OpenSim.Framework.Console.MainLog.Instance.Verbose("Db4LocalStorage creation");
}
catch (Exception e)
{
db.Close();
OpenSim.Framework.Console.MainConsole.Instance.Warn("Db4LocalStorage :Constructor - Exception occured");
OpenSim.Framework.Console.MainConsole.Instance.Warn(e.ToString());
OpenSim.Framework.Console.MainLog.Instance.Warn("Db4LocalStorage :Constructor - Exception occured");
OpenSim.Framework.Console.MainLog.Instance.Warn(e.ToString());
}
}
@ -123,7 +123,7 @@ namespace OpenSim.Storage.LocalStorageDb4o
public void LoadPrimitives(ILocalStorageReceiver receiver)
{
IObjectSet result = db.Get(typeof(PrimData));
OpenSim.Framework.Console.MainConsole.Instance.Verbose("Db4LocalStorage.cs: LoadPrimitives() - number of prims in storages is " + result.Count);
OpenSim.Framework.Console.MainLog.Instance.Verbose("Db4LocalStorage.cs: LoadPrimitives() - number of prims in storages is " + result.Count);
foreach (PrimData prim in result)
{
receiver.PrimFromStorage(prim);
@ -132,13 +132,13 @@ namespace OpenSim.Storage.LocalStorageDb4o
public float[] LoadWorld()
{
OpenSim.Framework.Console.MainConsole.Instance.Verbose("LoadWorld() - Loading world....");
OpenSim.Framework.Console.MainLog.Instance.Verbose("LoadWorld() - Loading world....");
float[] heightmap = null;
OpenSim.Framework.Console.MainConsole.Instance.Verbose("LoadWorld() - Looking for a heightmap in local DB");
OpenSim.Framework.Console.MainLog.Instance.Verbose("LoadWorld() - Looking for a heightmap in local DB");
IObjectSet world_result = db.Get(typeof(MapStorage));
if (world_result.Count > 0)
{
OpenSim.Framework.Console.MainConsole.Instance.Verbose("LoadWorld() - Found a heightmap in local database, loading");
OpenSim.Framework.Console.MainLog.Instance.Verbose("LoadWorld() - Found a heightmap in local database, loading");
MapStorage map = (MapStorage)world_result.Next();
//blank.LandMap = map.Map;
heightmap = map.Map;
@ -151,7 +151,7 @@ namespace OpenSim.Storage.LocalStorageDb4o
IObjectSet world_result = db.Get(typeof(MapStorage));
if (world_result.Count > 0)
{
OpenSim.Framework.Console.MainConsole.Instance.Verbose("SaveWorld() - updating saved copy of heightmap in local database");
OpenSim.Framework.Console.MainLog.Instance.Verbose("SaveWorld() - updating saved copy of heightmap in local database");
MapStorage map = (MapStorage)world_result.Next();
db.Delete(map);
}
@ -209,7 +209,7 @@ namespace OpenSim.Storage.LocalStorageDb4o
public void SaveParcels(ParcelData[] parcel_data)
{
MainConsole.Instance.Notice("Parcel Backup: Saving Parcels...");
MainLog.Instance.Notice("Parcel Backup: Saving Parcels...");
int i;
for (i = 0; i < parcel_data.GetLength(0); i++)
{
@ -217,7 +217,7 @@ namespace OpenSim.Storage.LocalStorageDb4o
SaveParcel(parcel_data[i]);
}
MainConsole.Instance.Notice("Parcel Backup: Parcel Save Complete");
MainLog.Instance.Notice("Parcel Backup: Parcel Save Complete");
}
public void RemoveParcel(ParcelData parcel)
@ -231,7 +231,7 @@ namespace OpenSim.Storage.LocalStorageDb4o
}
public void RemoveAllParcels()
{
MainConsole.Instance.Notice("Parcel Backup: Removing all parcels...");
MainLog.Instance.Notice("Parcel Backup: Removing all parcels...");
IObjectSet result = db.Get(typeof(ParcelData));
if (result.Count > 0)
{
@ -244,11 +244,11 @@ namespace OpenSim.Storage.LocalStorageDb4o
public void LoadParcels(ILocalStorageParcelReceiver recv)
{
MainConsole.Instance.Notice("Parcel Backup: Loading Parcels...");
MainLog.Instance.Notice("Parcel Backup: Loading Parcels...");
IObjectSet result = db.Get(typeof(ParcelData));
if (result.Count > 0)
{
MainConsole.Instance.Notice("Parcel Backup: Parcels exist in database.");
MainLog.Instance.Notice("Parcel Backup: Parcels exist in database.");
foreach (ParcelData parcelData in result)
{
@ -257,10 +257,10 @@ namespace OpenSim.Storage.LocalStorageDb4o
}
else
{
MainConsole.Instance.Notice("Parcel Backup: No parcels exist. Creating basic parcel.");
MainLog.Instance.Notice("Parcel Backup: No parcels exist. Creating basic parcel.");
recv.NoParcelDataFromStorage();
}
MainConsole.Instance.Notice("Parcel Backup: Parcels Restored");
MainLog.Instance.Notice("Parcel Backup: Parcels Restored");
}
public void ShutDown()
{

12
OpenSim/OpenSim.Storage/LocalStorageSQLite/SQLiteLocalStorage.cs
View File

@ -54,8 +54,8 @@ namespace OpenSim.Storage.LocalStorageSQLite
catch (Exception e)
{
db.Close();
OpenSim.Framework.Console.MainConsole.Instance.Warn("SQLiteLocalStorage :Constructor - Exception occured");
OpenSim.Framework.Console.MainConsole.Instance.Warn(e.ToString());
OpenSim.Framework.Console.MainLog.Instance.Warn("SQLiteLocalStorage :Constructor - Exception occured");
OpenSim.Framework.Console.MainLog.Instance.Warn(e.ToString());
}
}
@ -117,8 +117,8 @@ namespace OpenSim.Storage.LocalStorageSQLite
}
catch (Exception e)
{
OpenSim.Framework.Console.MainConsole.Instance.Warn("SQLiteLocalStorage :StorePrim - Exception occured");
OpenSim.Framework.Console.MainConsole.Instance.Warn(e.ToString());
OpenSim.Framework.Console.MainLog.Instance.Warn("SQLiteLocalStorage :StorePrim - Exception occured");
OpenSim.Framework.Console.MainLog.Instance.Warn(e.ToString());
}
cmd.Dispose();
@ -144,8 +144,8 @@ namespace OpenSim.Storage.LocalStorageSQLite
}
catch (Exception e)
{
OpenSim.Framework.Console.MainConsole.Instance.Warn("SQLiteLocalStorage :RemovePrim - Exception occured");
OpenSim.Framework.Console.MainConsole.Instance.Warn(e.ToString());
OpenSim.Framework.Console.MainLog.Instance.Warn("SQLiteLocalStorage :RemovePrim - Exception occured");
OpenSim.Framework.Console.MainLog.Instance.Warn(e.ToString());
}
cmd.Dispose();

112
OpenSim/OpenSim.Terrain.BasicTerrain/TerrainEngine.cs
View File

@ -34,6 +34,17 @@ using OpenJPEGNet;
namespace OpenSim.Terrain
{
public class TerrainCommand
{
public virtual bool run(string[] cmdargs, ref string output)
{
return false;
}
public string args;
public string help;
}
public class TerrainEngine
{
/// <summary>
@ -41,6 +52,16 @@ namespace OpenSim.Terrain
/// </summary>
public Channel heightmap;
/// <summary>
/// A copy of heightmap at the last save point (for reverting)
/// </summary>
public Channel revertmap;
/// <summary>
/// Water heightmap (needs clientside mods to work)
/// </summary>
public Channel watermap;
/// <summary>
/// Whether or not the terrain has been modified since it was last saved and sent to the Physics engine.
/// Counts the number of modifications since the last save. (0 = Untainted)
@ -145,6 +166,7 @@ namespace OpenSim.Terrain
{
case "help":
resultText += "terrain regenerate - rebuilds the sims terrain using a default algorithm\n";
resultText += "terrain voronoi <points> <blocksize> - generates a worley fractal with X points per block";
resultText += "terrain seed <seed> - sets the random seed value to <seed>\n";
resultText += "terrain load <type> <filename> - loads a terrain from disk, type can be 'F32', 'F64', 'RAW' or 'IMG'\n";
resultText += "terrain save <type> <filename> - saves a terrain to disk, type can be 'F32' or 'F64'\n";
@ -160,21 +182,18 @@ namespace OpenSim.Terrain
break;
case "erode":
switch (args[1].ToLower())
{
case "aerobic":
// WindSpeed, PickupMinimum,DropMinimum,Carry,Rounds,Lowest
heightmap.AerobicErosion(Convert.ToDouble(args[2]), Convert.ToDouble(args[3]), Convert.ToDouble(args[4]), Convert.ToDouble(args[5]), Convert.ToInt32(args[6]), Convert.ToBoolean(args[7]));
break;
case "thermal":
heightmap.thermalWeathering(Convert.ToDouble(args[2]), Convert.ToInt32(args[3]), Convert.ToDouble(args[4]));
break;
default:
resultText = "Unknown erosion type";
return false;
}
return consoleErosion(args, ref resultText);
case "voronoi":
double[] c = new double[2];
c[0] = -1;
c[1] = 1;
heightmap.voronoiDiagram(Convert.ToInt32(args[1]), Convert.ToInt32(args[2]), c);
break;
case "hills":
return consoleHills(args, ref resultText);
case "regenerate":
hills();
break;
@ -246,6 +265,73 @@ namespace OpenSim.Terrain
}
}
private bool consoleErosion(string[] args, ref string resultText)
{
switch (args[1].ToLower())
{
case "aerobic":
// WindSpeed, PickupMinimum,DropMinimum,Carry,Rounds,Lowest
heightmap.AerobicErosion(Convert.ToDouble(args[2]), Convert.ToDouble(args[3]), Convert.ToDouble(args[4]), Convert.ToDouble(args[5]), Convert.ToInt32(args[6]), Convert.ToBoolean(args[7]));
break;
case "thermal":
heightmap.thermalWeathering(Convert.ToDouble(args[2]), Convert.ToInt32(args[3]), Convert.ToDouble(args[4]));
break;
default:
resultText = "Unknown erosion type";
return false;
}
return true;
}
private bool consoleHills(string[] args, ref string resultText)
{
int count;
double sizeMin;
double sizeRange;
bool island;
bool additive;
bool noisy;
if (args.GetLength(0) > 2)
{
count = Convert.ToInt32(args[2]);
sizeMin = Convert.ToDouble(args[3]);
sizeRange = Convert.ToDouble(args[4]);
island = Convert.ToBoolean(args[5]);
additive = Convert.ToBoolean(args[6]);
noisy = Convert.ToBoolean(args[7]);
}
else
{
count = 200;
sizeMin = 20;
sizeRange = 40;
island = true;
additive = true;
noisy = false;
}
switch (args[1].ToLower())
{
case "blocks":
heightmap.hillsBlocks(count, sizeMin, sizeRange, island, additive, noisy);
break;
case "cones":
heightmap.hillsCones(count, sizeMin, sizeRange, island, additive, noisy);
break;
case "spheres":
heightmap.hillsSpheres(count, sizeMin, sizeRange, island, additive, noisy);
break;
case "squared":
heightmap.hillsSquared(count, sizeMin, sizeRange, island, additive, noisy);
break;
default:
resultText = "Unknown hills type";
return false;
}
return true;
}
/// <summary>
/// Renormalises the array between min and max
/// </summary>

2
OpenSim/OpenSim/Application.cs
View File

@ -115,7 +115,7 @@ namespace OpenSim
while (true)
{
OpenSim.Framework.Console.MainConsole.Instance.MainConsolePrompt();
OpenSim.Framework.Console.MainLog.Instance.MainLogPrompt();
}
}
}

52
OpenSim/OpenSim/OpenSimMain.cs
View File

@ -91,10 +91,10 @@ namespace OpenSim
this.SetupFromConfigFile(this.localConfig);
}
m_console = new ConsoleBase(m_logFilename, "Region", this, m_silent);
OpenSim.Framework.Console.MainConsole.Instance = m_console;
m_log = new LogBase(m_logFilename, "Region", this, m_silent);
OpenSim.Framework.Console.MainLog.Instance = m_log;
m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Startup() - Loading configuration");
m_log.Verbose( "Main.cs:Startup() - Loading configuration");
this.serversData.InitConfig(this.m_sandbox, this.localConfig);
this.localConfig.Close();//for now we can close it as no other classes read from it , but this should change
@ -122,7 +122,7 @@ namespace OpenSim
this.SetupWorld();
m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Startup() - Initialising HTTP server");
m_log.Verbose( "Main.cs:Startup() - Initialising HTTP server");
this.SetupHttpListener();
@ -140,7 +140,7 @@ namespace OpenSim
}
//Start http server
m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Startup() - Starting HTTP server");
m_log.Verbose( "Main.cs:Startup() - Starting HTTP server");
httpServer.Start();
// Start UDP servers
@ -161,7 +161,7 @@ namespace OpenSim
}
catch (Exception e)
{
m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, e.Message + "\nSorry, could not setup local cache");
m_log.Error( e.Message + "\nSorry, could not setup local cache");
Environment.Exit(1);
}
@ -176,7 +176,7 @@ namespace OpenSim
}
catch (Exception e)
{
m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, e.Message + "\nSorry, could not setup remote cache");
m_log.Error( e.Message + "\nSorry, could not setup remote cache");
Environment.Exit(1);
}
}
@ -227,15 +227,15 @@ namespace OpenSim
regionDat.InitConfig(this.m_sandbox, regionConfig);
regionConfig.Close();
udpServer = new UDPServer(regionDat.IPListenPort, this.AssetCache, this.InventoryCache, this.m_console, authenBase);
udpServer = new UDPServer(regionDat.IPListenPort, this.AssetCache, this.InventoryCache, this.m_log, authenBase);
m_udpServer.Add(udpServer);
this.regionData.Add(regionDat);
/*
m_console.WriteLine(OpenSim.Framework.Console.LogPriority.NORMAL, "Main.cs:Startup() - We are " + regionData.RegionName + " at " + regionData.RegionLocX.ToString() + "," + regionData.RegionLocY.ToString());
m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Initialising world");
m_console.componentname = "Region " + regionData.RegionName;
m_log.WriteLine(OpenSim.Framework.Console.LogPriority.NORMAL, "Main.cs:Startup() - We are " + regionData.RegionName + " at " + regionData.RegionLocX.ToString() + "," + regionData.RegionLocY.ToString());
m_log.Verbose( "Initialising world");
m_log.componentname = "Region " + regionData.RegionName;
*/
LocalWorld = new Scene(udpServer.PacketServer.ClientAPIs, regionDat, authenBase, commsManager, this.AssetCache);
@ -248,7 +248,7 @@ namespace OpenSim
LocalWorld.LoadStorageDLL("OpenSim.Storage.LocalStorageDb4o.dll"); //all these dll names shouldn't be hard coded.
LocalWorld.LoadWorldMap();
m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Startup() - Starting up messaging system");
m_log.Verbose( "Main.cs:Startup() - Starting up messaging system");
LocalWorld.PhysScene = this.physManager.GetPhysicsScene(this.m_physicsEngine);
LocalWorld.PhysScene.SetTerrain(LocalWorld.Terrain.getHeights1D());
LocalWorld.LoadPrimsFromStorage();
@ -355,7 +355,7 @@ namespace OpenSim
switch (attri)
{
default:
m_console.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "Main.cs: SetupFromConfig() - Invalid value for PhysicsEngine attribute, terminating");
m_log.Warn( "Main.cs: SetupFromConfig() - Invalid value for PhysicsEngine attribute, terminating");
Environment.Exit(1);
break;
@ -391,16 +391,16 @@ namespace OpenSim
/// </summary>
public virtual void Shutdown()
{
m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Shutdown() - Closing all threads");
m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Shutdown() - Killing listener thread");
m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Shutdown() - Killing clients");
m_log.Verbose( "Main.cs:Shutdown() - Closing all threads");
m_log.Verbose( "Main.cs:Shutdown() - Killing listener thread");
m_log.Verbose( "Main.cs:Shutdown() - Killing clients");
// IMPLEMENT THIS
m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Shutdown() - Closing console and terminating");
m_log.Verbose( "Main.cs:Shutdown() - Closing console and terminating");
for (int i = 0; i < m_localWorld.Count; i++)
{
((Scene)m_localWorld[i]).Close();
}
m_console.Close();
m_log.Close();
Environment.Exit(0);
}
@ -415,8 +415,8 @@ namespace OpenSim
switch (command)
{
case "help":
m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, "show users - show info about connected users");
m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, "shutdown - disconnect all clients and shutdown");
m_log.Error( "show users - show info about connected users");
m_log.Error( "shutdown - disconnect all clients and shutdown");
break;
case "show":
@ -430,7 +430,7 @@ namespace OpenSim
//string result = "";
/* if (!((World)m_localWorld).Terrain.RunTerrainCmd(cmdparams, ref result))
{
m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, result);
m_log.Error( result);
}*/
break;
@ -439,7 +439,7 @@ namespace OpenSim
break;
default:
m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, "Unknown command");
m_log.Error( "Unknown command");
break;
}
}
@ -453,18 +453,18 @@ namespace OpenSim
switch (ShowWhat)
{
case "uptime":
m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, "OpenSim has been running since " + startuptime.ToString());
m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, "That is " + (DateTime.Now - startuptime).ToString());
m_log.Error( "OpenSim has been running since " + startuptime.ToString());
m_log.Error( "That is " + (DateTime.Now - startuptime).ToString());
break;
case "users":
OpenSim.Region.Scenes.Avatar TempAv;
m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16}{5,-16}", "Firstname", "Lastname", "Agent ID", "Session ID", "Circuit", "IP"));
m_log.Error( String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16}{5,-16}", "Firstname", "Lastname", "Agent ID", "Session ID", "Circuit", "IP"));
/* foreach (libsecondlife.LLUUID UUID in LocalWorld.Entities.Keys)
{
if (LocalWorld.Entities[UUID].ToString() == "OpenSim.world.Avatar")
{
TempAv = (OpenSim.world.Avatar)LocalWorld.Entities[UUID];
m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16},{5,-16}", TempAv.firstname, TempAv.lastname, UUID, TempAv.ControllingClient.SessionID, TempAv.ControllingClient.CircuitCode, TempAv.ControllingClient.userEP.ToString()));
m_log.Error( String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16},{5,-16}", TempAv.firstname, TempAv.lastname, UUID, TempAv.ControllingClient.SessionID, TempAv.ControllingClient.CircuitCode, TempAv.ControllingClient.userEP.ToString()));
}
}*/
break;