Only 193 warnings to go!
parent
06ffeb22d9
commit
fd84968d05
|
@ -2,8 +2,6 @@ using System;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
|
|
||||||
namespace OpenSim.Framework.Console
|
namespace OpenSim.Framework.Console
|
||||||
{
|
|
||||||
public class ConsoleBase
|
|
||||||
{
|
{
|
||||||
public enum LogPriority : int
|
public enum LogPriority : int
|
||||||
{
|
{
|
||||||
|
@ -16,6 +14,8 @@ namespace OpenSim.Framework.Console
|
||||||
EXTRAVERBOSE
|
EXTRAVERBOSE
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public class ConsoleBase
|
||||||
|
{
|
||||||
StreamWriter Log;
|
StreamWriter Log;
|
||||||
public conscmd_callback cmdparser;
|
public conscmd_callback cmdparser;
|
||||||
public string componentname;
|
public string componentname;
|
||||||
|
@ -142,7 +142,7 @@ namespace OpenSim.Framework.Console
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
this.WriteLine("Valid options are " + OptionA + " or " + OptionB);
|
this.WriteLine(LogPriority.MEDIUM,"Valid options are " + OptionA + " or " + OptionB);
|
||||||
temp = CmdPrompt(prompt, defaultresponse);
|
temp = CmdPrompt(prompt, defaultresponse);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,6 +6,7 @@ using System.IO;
|
||||||
using OpenSim.Framework.Interfaces;
|
using OpenSim.Framework.Interfaces;
|
||||||
using OpenSim.Framework.Types;
|
using OpenSim.Framework.Types;
|
||||||
using OpenSim.Framework.Utilities;
|
using OpenSim.Framework.Utilities;
|
||||||
|
using OpenSim.Framework.Console;
|
||||||
using libsecondlife;
|
using libsecondlife;
|
||||||
using Db4objects.Db4o;
|
using Db4objects.Db4o;
|
||||||
using Db4objects.Db4o.Query;
|
using Db4objects.Db4o.Query;
|
||||||
|
@ -38,16 +39,16 @@ namespace OpenSim.GridInterfaces.Local
|
||||||
this._assetRequests = new BlockingQueue<ARequest>();
|
this._assetRequests = new BlockingQueue<ARequest>();
|
||||||
yapfile = System.IO.File.Exists("assets.yap");
|
yapfile = System.IO.File.Exists("assets.yap");
|
||||||
|
|
||||||
OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Local Asset Server class created");
|
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.VERBOSE,"Local Asset Server class created");
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
db = Db4oFactory.OpenFile("assets.yap");
|
db = Db4oFactory.OpenFile("assets.yap");
|
||||||
OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Db4 Asset database creation");
|
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.VERBOSE,"Db4 Asset database creation");
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
db.Close();
|
db.Close();
|
||||||
OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Db4 Asset server :Constructor - Exception occured");
|
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.MEDIUM,"Db4 Asset server :Constructor - Exception occured");
|
||||||
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(e.ToString());
|
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(e.ToString());
|
||||||
}
|
}
|
||||||
if (!yapfile)
|
if (!yapfile)
|
||||||
|
@ -96,7 +97,7 @@ namespace OpenSim.GridInterfaces.Local
|
||||||
{
|
{
|
||||||
if (db != null)
|
if (db != null)
|
||||||
{
|
{
|
||||||
Console.WriteLine("Closing local Asset server database");
|
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.VERBOSE, "Closing local asset server database");
|
||||||
db.Close();
|
db.Close();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -140,7 +141,7 @@ namespace OpenSim.GridInterfaces.Local
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
|
||||||
Console.WriteLine("setting up Asset database");
|
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.VERBOSE, "Setting up asset database");
|
||||||
|
|
||||||
AssetBase Image = new AssetBase();
|
AssetBase Image = new AssetBase();
|
||||||
Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000001");
|
Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000001");
|
||||||
|
|
|
@ -30,6 +30,7 @@ using System.Threading;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using OpenSim.Framework.Interfaces;
|
using OpenSim.Framework.Interfaces;
|
||||||
using OpenSim.Framework.Types;
|
using OpenSim.Framework.Types;
|
||||||
|
using OpenSim.Framework.Console;
|
||||||
using libsecondlife;
|
using libsecondlife;
|
||||||
using Db4objects.Db4o;
|
using Db4objects.Db4o;
|
||||||
using Db4objects.Db4o.Query;
|
using Db4objects.Db4o.Query;
|
||||||
|
@ -60,7 +61,7 @@ namespace OpenSim.GridInterfaces.Local
|
||||||
public LocalGridServer()
|
public LocalGridServer()
|
||||||
{
|
{
|
||||||
Sessions = new List<Login>();
|
Sessions = new List<Login>();
|
||||||
OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Local Grid Server class created");
|
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.VERBOSE,"Local Grid Server class created");
|
||||||
}
|
}
|
||||||
|
|
||||||
public override bool RequestConnection(LLUUID SimUUID, string sim_ip, uint sim_port)
|
public override bool RequestConnection(LLUUID SimUUID, string sim_ip, uint sim_port)
|
||||||
|
|
|
@ -30,6 +30,7 @@ using System.Collections;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
using Axiom.MathLib;
|
using Axiom.MathLib;
|
||||||
|
using OpenSim.Framework.Console;
|
||||||
|
|
||||||
namespace OpenSim.Physics.Manager
|
namespace OpenSim.Physics.Manager
|
||||||
{
|
{
|
||||||
|
@ -54,14 +55,13 @@ namespace OpenSim.Physics.Manager
|
||||||
|
|
||||||
if(_plugins.ContainsKey(engineName))
|
if(_plugins.ContainsKey(engineName))
|
||||||
{
|
{
|
||||||
OpenSim.Framework.Console.MainConsole.Instance.WriteLine("creating "+engineName);
|
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.LOW,"creating "+engineName);
|
||||||
return _plugins[engineName].GetScene();
|
return _plugins[engineName].GetScene();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
string error = String.Format("couldn't find physicsEngine: {0}", engineName);
|
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.MEDIUM,"couldn't find physicsEngine: {0}",engineName);
|
||||||
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(error);
|
throw new ArgumentException(String.Format("couldn't find physicsEngine: {0}",engineName));
|
||||||
throw new ArgumentException(error);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -28,6 +28,7 @@
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
|
using OpenSim.Framework.Console;
|
||||||
|
|
||||||
namespace OpenSim.Physics.Manager
|
namespace OpenSim.Physics.Manager
|
||||||
{
|
{
|
||||||
|
@ -65,13 +66,13 @@ namespace OpenSim.Physics.Manager
|
||||||
|
|
||||||
public override PhysicsActor AddAvatar(PhysicsVector position)
|
public override PhysicsActor AddAvatar(PhysicsVector position)
|
||||||
{
|
{
|
||||||
OpenSim.Framework.Console.MainConsole.Instance.WriteLine("NullPhysicsScene : AddAvatar({0})", position);
|
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.VERBOSE,"NullPhysicsScene : AddAvatar({0})", position);
|
||||||
return PhysicsActor.Null;
|
return PhysicsActor.Null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public override PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size)
|
public override PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size)
|
||||||
{
|
{
|
||||||
OpenSim.Framework.Console.MainConsole.Instance.WriteLine("NullPhysicsScene : AddPrim({0},{1})", position, size);
|
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.VERBOSE, "NullPhysicsScene : AddPrim({0},{1})", position, size);
|
||||||
return PhysicsActor.Null;
|
return PhysicsActor.Null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -84,12 +85,12 @@ namespace OpenSim.Physics.Manager
|
||||||
|
|
||||||
public override void GetResults()
|
public override void GetResults()
|
||||||
{
|
{
|
||||||
OpenSim.Framework.Console.MainConsole.Instance.WriteLine("NullPhysicsScene : GetResults()");
|
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.VERBOSE, "NullPhysicsScene : GetResults()");
|
||||||
}
|
}
|
||||||
|
|
||||||
public override void SetTerrain(float[] heightMap)
|
public override void SetTerrain(float[] heightMap)
|
||||||
{
|
{
|
||||||
OpenSim.Framework.Console.MainConsole.Instance.WriteLine("NullPhysicsScene : SetTerrain({0} items)", heightMap.Length);
|
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.VERBOSE, "NullPhysicsScene : SetTerrain({0} items)", heightMap.Length);
|
||||||
}
|
}
|
||||||
|
|
||||||
public override void DeleteTerrain()
|
public override void DeleteTerrain()
|
||||||
|
|
|
@ -7,6 +7,7 @@ using System.Threading;
|
||||||
//using OpenSim.CAPS;
|
//using OpenSim.CAPS;
|
||||||
using Nwc.XmlRpc;
|
using Nwc.XmlRpc;
|
||||||
using System.Collections;
|
using System.Collections;
|
||||||
|
using OpenSim.Framework.Console;
|
||||||
|
|
||||||
namespace OpenSim.Servers
|
namespace OpenSim.Servers
|
||||||
{
|
{
|
||||||
|
@ -219,7 +220,7 @@ namespace OpenSim.Servers
|
||||||
|
|
||||||
public void Start()
|
public void Start()
|
||||||
{
|
{
|
||||||
OpenSim.Framework.Console.MainConsole.Instance.WriteLine("BaseHttpServer.cs: Starting up HTTP Server");
|
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.LOW,"BaseHttpServer.cs: Starting up HTTP Server");
|
||||||
|
|
||||||
m_workerThread = new Thread(new ThreadStart(StartHTTP));
|
m_workerThread = new Thread(new ThreadStart(StartHTTP));
|
||||||
m_workerThread.IsBackground = true;
|
m_workerThread.IsBackground = true;
|
||||||
|
@ -230,7 +231,7 @@ namespace OpenSim.Servers
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
OpenSim.Framework.Console.MainConsole.Instance.WriteLine("BaseHttpServer.cs: StartHTTP() - Spawned main thread OK");
|
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.LOW,"BaseHttpServer.cs: StartHTTP() - Spawned main thread OK");
|
||||||
m_httpListener = new HttpListener();
|
m_httpListener = new HttpListener();
|
||||||
|
|
||||||
m_httpListener.Prefixes.Add("http://+:" + m_port + "/");
|
m_httpListener.Prefixes.Add("http://+:" + m_port + "/");
|
||||||
|
@ -245,7 +246,7 @@ namespace OpenSim.Servers
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(e.Message);
|
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.MEDIUM,e.Message);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,6 +7,7 @@ using System.Text.RegularExpressions;
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
using Nwc.XmlRpc;
|
using Nwc.XmlRpc;
|
||||||
using System.Collections;
|
using System.Collections;
|
||||||
|
using OpenSim.Framework.Console;
|
||||||
|
|
||||||
namespace OpenSim.Servers
|
namespace OpenSim.Servers
|
||||||
{
|
{
|
||||||
|
@ -35,8 +36,8 @@ namespace OpenSim.Servers
|
||||||
|
|
||||||
private void DoWork()
|
private void DoWork()
|
||||||
{
|
{
|
||||||
OpenSim.Framework.Console.MainConsole.Instance.WriteLine("OpenGridProtocol.cs: ClientHandler.DoWork() - Got new client");
|
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.LOW,"OpenGridProtocol.cs: ClientHandler.DoWork() - Got new client");
|
||||||
this.WriteLine("OpenSim 0.1, running OGS protocol 1.0");
|
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.NORMAL, "OpenSim 0.1, running OGS protocol 1.0");
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -55,7 +56,7 @@ namespace OpenSim.Servers
|
||||||
|
|
||||||
public void Start()
|
public void Start()
|
||||||
{
|
{
|
||||||
OpenSim.Framework.Console.MainConsole.Instance.WriteLine("OpenGridProtocol.cs: Start() - Opening server socket");
|
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.LOW,"OpenGridProtocol.cs: Start() - Opening server socket");
|
||||||
|
|
||||||
m_clients = new ArrayList();
|
m_clients = new ArrayList();
|
||||||
m_workerThread = new Thread(new ThreadStart(StartServerSocket));
|
m_workerThread = new Thread(new ThreadStart(StartServerSocket));
|
||||||
|
@ -67,7 +68,7 @@ namespace OpenSim.Servers
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
OpenSim.Framework.Console.MainConsole.Instance.WriteLine("OpenGridProtocol.cs: StartServerSocket() - Spawned main thread OK");
|
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.LOW,"OpenGridProtocol.cs: StartServerSocket() - Spawned main thread OK");
|
||||||
|
|
||||||
|
|
||||||
m_IPendpoint = new IPEndPoint(IPAddress.Any, m_port);
|
m_IPendpoint = new IPEndPoint(IPAddress.Any, m_port);
|
||||||
|
@ -87,7 +88,7 @@ namespace OpenSim.Servers
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(e.Message);
|
OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.MEDIUM,e.Message);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue