aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Common/OpenSim.Framework.Console/ConsoleBase.cs42
-rw-r--r--Common/OpenSim.Servers/BaseHttpServer.cs6
-rw-r--r--Common/OpenSim.Servers/CheckSumServer.cs3
-rw-r--r--Common/OpenSim.Servers/LoginResponse.cs6
-rw-r--r--OpenSim/OpenSim.GridInterfaces/Local/LocalAssetServer.cs12
-rw-r--r--OpenSim/OpenSim.GridInterfaces/Local/LocalGridServer.cs2
-rw-r--r--OpenSim/OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs4
-rw-r--r--OpenSim/OpenSim.GridInterfaces/Remote/RemoteGridServer.cs7
-rw-r--r--OpenSim/OpenSim.Physics/Manager/PhysicsManager.cs4
-rw-r--r--OpenSim/OpenSim.Physics/Manager/PhysicsScene.cs8
-rw-r--r--OpenSim/OpenSim.RegionServer/Assets/AssetCache.cs5
-rw-r--r--OpenSim/OpenSim.RegionServer/ClientView.Grid.cs7
-rw-r--r--OpenSim/OpenSim.RegionServer/ClientView.PacketHandlers.cs3
-rw-r--r--OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs5
-rw-r--r--OpenSim/OpenSim.RegionServer/ClientView.cs19
-rw-r--r--OpenSim/OpenSim.RegionServer/ClientViewBase.cs7
-rw-r--r--OpenSim/OpenSim.RegionServer/OpenSimMain.cs50
-rw-r--r--OpenSim/OpenSim.RegionServer/RegionInfo.cs28
-rw-r--r--OpenSim/OpenSim.RegionServer/UDPServer.cs6
-rw-r--r--OpenSim/OpenSim.RegionServer/world/Avatar.cs10
-rw-r--r--OpenSim/OpenSim.RegionServer/world/AvatarAnimations.cs4
-rw-r--r--OpenSim/OpenSim.RegionServer/world/World.PacketHandlers.cs2
-rw-r--r--OpenSim/OpenSim.RegionServer/world/World.cs61
-rw-r--r--OpenSim/OpenSim.RegionServer/world/WorldBase.cs5
-rw-r--r--OpenSim/OpenSim.Storage/LocalStorageDb4o/Db4LocalStorage.cs35
-rw-r--r--OpenSim/OpenSim.Storage/LocalStorageSQLite/SQLiteLocalStorage.cs12
-rw-r--r--OpenSim/OpenSim/OpenSimMain.cs62
27 files changed, 221 insertions, 194 deletions
diff --git a/Common/OpenSim.Framework.Console/ConsoleBase.cs b/Common/OpenSim.Framework.Console/ConsoleBase.cs
index 6a1c53c..160b8f6 100644
--- a/Common/OpenSim.Framework.Console/ConsoleBase.cs
+++ b/Common/OpenSim.Framework.Console/ConsoleBase.cs
@@ -41,29 +41,49 @@ namespace OpenSim.Framework.Console
41 41
42 public void Write(string format, params object[] args) 42 public void Write(string format, params object[] args)
43 { 43 {
44 WriteLine(LogPriority.NORMAL,format,args); 44 Notice(format,args);
45 return; 45 return;
46 } 46 }
47 47
48 [Obsolete("WriteLine(msg,args) has been depreciated, use WriteLine(priority,msg,args) instead.")] 48 public void Warn(string format, params object[] args)
49 public void WriteLine(string format, params object[] args)
50 { 49 {
51 Log.WriteLine(format, args); 50 WriteNewLine(ConsoleColor.Yellow, format, args);
52 Log.Flush(); 51 return;
53 if(!m_silent) 52 }
54 { 53
55 System.Console.WriteLine(format, args); 54 public void Notice(string format, params object[] args)
56 } 55 {
56 WriteNewLine(ConsoleColor.White, format, args);
57 return;
58 }
59
60 public void Error(string format, params object[] args)
61 {
62 WriteNewLine(ConsoleColor.Red, format, args);
63 return;
64 }
65
66 public void Verbose(string format, params object[] args)
67 {
68 WriteNewLine(ConsoleColor.Gray, format, args);
69 return;
70 }
71
72 public void Status(string format, params object[] args)
73 {
74 WriteNewLine(ConsoleColor.Blue, format, args);
57 return; 75 return;
58 } 76 }
59 77
60 public void WriteLine(LogPriority importance, string format, params object[] args) 78 private void WriteNewLine(System.ConsoleColor color, string format, params object[] args)
61 { 79 {
62 Log.WriteLine(format, args); 80 Log.WriteLine(format, args);
63 Log.Flush(); 81 Log.Flush();
64 if (!m_silent) 82 if (!m_silent)
65 { 83 {
84 System.Console.ForegroundColor = color;
66 System.Console.WriteLine(format, args); 85 System.Console.WriteLine(format, args);
86 System.Console.ResetColor();
67 } 87 }
68 return; 88 return;
69 } 89 }
@@ -130,7 +150,7 @@ namespace OpenSim.Framework.Console
130 } 150 }
131 else 151 else
132 { 152 {
133 this.WriteLine(LogPriority.MEDIUM,"Valid options are " + OptionA + " or " + OptionB); 153 Notice("Valid options are " + OptionA + " or " + OptionB);
134 temp = CmdPrompt(prompt, defaultresponse); 154 temp = CmdPrompt(prompt, defaultresponse);
135 } 155 }
136 } 156 }
diff --git a/Common/OpenSim.Servers/BaseHttpServer.cs b/Common/OpenSim.Servers/BaseHttpServer.cs
index 38f4370..3f9109d 100644
--- a/Common/OpenSim.Servers/BaseHttpServer.cs
+++ b/Common/OpenSim.Servers/BaseHttpServer.cs
@@ -223,7 +223,7 @@ namespace OpenSim.Servers
223 223
224 public void Start() 224 public void Start()
225 { 225 {
226 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.LOW, "BaseHttpServer.cs: Starting up HTTP Server"); 226 MainConsole.Instance.Verbose("BaseHttpServer.cs: Starting up HTTP Server");
227 227
228 m_workerThread = new Thread(new ThreadStart(StartHTTP)); 228 m_workerThread = new Thread(new ThreadStart(StartHTTP));
229 m_workerThread.IsBackground = true; 229 m_workerThread.IsBackground = true;
@@ -234,7 +234,7 @@ namespace OpenSim.Servers
234 { 234 {
235 try 235 try
236 { 236 {
237 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.LOW, "BaseHttpServer.cs: StartHTTP() - Spawned main thread OK"); 237 MainConsole.Instance.Verbose("BaseHttpServer.cs: StartHTTP() - Spawned main thread OK");
238 m_httpListener = new HttpListener(); 238 m_httpListener = new HttpListener();
239 239
240 m_httpListener.Prefixes.Add("http://+:" + m_port + "/"); 240 m_httpListener.Prefixes.Add("http://+:" + m_port + "/");
@@ -249,7 +249,7 @@ namespace OpenSim.Servers
249 } 249 }
250 catch (Exception e) 250 catch (Exception e)
251 { 251 {
252 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.MEDIUM, e.Message); 252 MainConsole.Instance.Warn(e.Message);
253 } 253 }
254 } 254 }
255 } 255 }
diff --git a/Common/OpenSim.Servers/CheckSumServer.cs b/Common/OpenSim.Servers/CheckSumServer.cs
index 1125baf..280eb82 100644
--- a/Common/OpenSim.Servers/CheckSumServer.cs
+++ b/Common/OpenSim.Servers/CheckSumServer.cs
@@ -100,8 +100,7 @@ namespace OpenSim.Servers
100 } 100 }
101 catch (Exception) 101 catch (Exception)
102 { 102 {
103 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "OpenSimClient.cs:ProcessOutPacket() - WARNING: Socket exception occurred on connection "); 103 MainConsole.Instance.Warn("OpenSimClient.cs:ProcessOutPacket() - WARNING: Socket exception occurred on connection ");
104
105 } 104 }
106 } 105 }
107 106
diff --git a/Common/OpenSim.Servers/LoginResponse.cs b/Common/OpenSim.Servers/LoginResponse.cs
index 7333d1f..e78def4 100644
--- a/Common/OpenSim.Servers/LoginResponse.cs
+++ b/Common/OpenSim.Servers/LoginResponse.cs
@@ -210,8 +210,7 @@ namespace OpenSim.UserServer
210 } 210 }
211 catch (Exception e) 211 catch (Exception e)
212 { 212 {
213 OpenSim.Framework.Console.MainConsole.Instance.WriteLine( 213 OpenSim.Framework.Console.MainConsole.Instance.Warn(
214 OpenSim.Framework.Console.LogPriority.LOW,
215 "LoginResponse: Unable to set default values: " + e.Message 214 "LoginResponse: Unable to set default values: " + e.Message
216 ); 215 );
217 } 216 }
@@ -326,8 +325,7 @@ namespace OpenSim.UserServer
326 } 325 }
327 catch (Exception e) 326 catch (Exception e)
328 { 327 {
329 OpenSim.Framework.Console.MainConsole.Instance.WriteLine( 328 OpenSim.Framework.Console.MainConsole.Instance.Error(
330 OpenSim.Framework.Console.LogPriority.LOW,
331 "LoginResponse: Error creating XML-RPC Response: " + e.Message 329 "LoginResponse: Error creating XML-RPC Response: " + e.Message
332 ); 330 );
333 return (this.GenerateFailureResponse("Internal Error", "Error generating Login Response", "false")); 331 return (this.GenerateFailureResponse("Internal Error", "Error generating Login Response", "false"));
diff --git a/OpenSim/OpenSim.GridInterfaces/Local/LocalAssetServer.cs b/OpenSim/OpenSim.GridInterfaces/Local/LocalAssetServer.cs
index 5f75821..a5fb636 100644
--- a/OpenSim/OpenSim.GridInterfaces/Local/LocalAssetServer.cs
+++ b/OpenSim/OpenSim.GridInterfaces/Local/LocalAssetServer.cs
@@ -39,17 +39,17 @@ namespace OpenSim.GridInterfaces.Local
39 this._assetRequests = new BlockingQueue<ARequest>(); 39 this._assetRequests = new BlockingQueue<ARequest>();
40 yapfile = System.IO.File.Exists("assets.yap"); 40 yapfile = System.IO.File.Exists("assets.yap");
41 41
42 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.VERBOSE,"Local Asset Server class created"); 42 MainConsole.Instance.Verbose("Local Asset Server class created");
43 try 43 try
44 { 44 {
45 db = Db4oFactory.OpenFile("assets.yap"); 45 db = Db4oFactory.OpenFile("assets.yap");
46 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.VERBOSE,"Db4 Asset database creation"); 46 MainConsole.Instance.Verbose("Db4 Asset database creation");
47 } 47 }
48 catch (Exception e) 48 catch (Exception e)
49 { 49 {
50 db.Close(); 50 db.Close();
51 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.MEDIUM,"Db4 Asset server :Constructor - Exception occured"); 51 MainConsole.Instance.Warn("Db4 Asset server :Constructor - Exception occured");
52 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, e.ToString()); 52 MainConsole.Instance.Warn(e.ToString());
53 } 53 }
54 if (!yapfile) 54 if (!yapfile)
55 { 55 {
@@ -97,7 +97,7 @@ namespace OpenSim.GridInterfaces.Local
97 { 97 {
98 if (db != null) 98 if (db != null)
99 { 99 {
100 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.VERBOSE, "Closing local asset server database"); 100 MainConsole.Instance.Verbose( "Closing local asset server database");
101 db.Close(); 101 db.Close();
102 } 102 }
103 } 103 }
@@ -141,7 +141,7 @@ namespace OpenSim.GridInterfaces.Local
141 try 141 try
142 { 142 {
143 143
144 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.VERBOSE, "Setting up asset database"); 144 MainConsole.Instance.Verbose( "Setting up asset database");
145 145
146 AssetBase Image = new AssetBase(); 146 AssetBase Image = new AssetBase();
147 Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000001"); 147 Image.FullID = new LLUUID("00000000-0000-0000-9999-000000000001");
diff --git a/OpenSim/OpenSim.GridInterfaces/Local/LocalGridServer.cs b/OpenSim/OpenSim.GridInterfaces/Local/LocalGridServer.cs
index fdd6ba4..36b7cbc 100644
--- a/OpenSim/OpenSim.GridInterfaces/Local/LocalGridServer.cs
+++ b/OpenSim/OpenSim.GridInterfaces/Local/LocalGridServer.cs
@@ -62,7 +62,7 @@ namespace OpenSim.GridInterfaces.Local
62 public LocalGridServer() 62 public LocalGridServer()
63 { 63 {
64 Sessions = new List<Login>(); 64 Sessions = new List<Login>();
65 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.VERBOSE,"Local Grid Server class created"); 65 MainConsole.Instance.Verbose("Local Grid Server class created");
66 } 66 }
67 67
68 public override bool RequestConnection(LLUUID SimUUID, string sim_ip, uint sim_port) 68 public override bool RequestConnection(LLUUID SimUUID, string sim_ip, uint sim_port)
diff --git a/OpenSim/OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs b/OpenSim/OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs
index 7432dee..aef848d 100644
--- a/OpenSim/OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs
+++ b/OpenSim/OpenSim.GridInterfaces/Remote/RemoteAssetServer.cs
@@ -26,7 +26,7 @@ namespace OpenSim.GridInterfaces.Remote
26 this._remoteAssetServerThread = new Thread(new ThreadStart(RunRequests)); 26 this._remoteAssetServerThread = new Thread(new ThreadStart(RunRequests));
27 this._remoteAssetServerThread.IsBackground = true; 27 this._remoteAssetServerThread.IsBackground = true;
28 this._remoteAssetServerThread.Start(); 28 this._remoteAssetServerThread.Start();
29 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Remote Asset Server class created"); 29 OpenSim.Framework.Console.MainConsole.Instance.Verbose("Remote Asset Server class created");
30 } 30 }
31 31
32 public void SetReceiver(IAssetReceiver receiver) 32 public void SetReceiver(IAssetReceiver receiver)
@@ -71,7 +71,7 @@ namespace OpenSim.GridInterfaces.Remote
71 // 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 71 // 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
72 ARequest req = this._assetRequests.Dequeue(); 72 ARequest req = this._assetRequests.Dequeue();
73 LLUUID assetID = req.AssetID; 73 LLUUID assetID = req.AssetID;
74 // OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW," RemoteAssetServer- Got a AssetServer request, processing it - " + this.AssetServerUrl + "assets/" + assetID); 74 // OpenSim.Framework.Console.MainConsole.Instance.Verbose(" RemoteAssetServer- Got a AssetServer request, processing it - " + this.AssetServerUrl + "assets/" + assetID);
75 WebRequest AssetLoad = WebRequest.Create(this.AssetServerUrl + "assets/" + assetID); 75 WebRequest AssetLoad = WebRequest.Create(this.AssetServerUrl + "assets/" + assetID);
76 WebResponse AssetResponse = AssetLoad.GetResponse(); 76 WebResponse AssetResponse = AssetLoad.GetResponse();
77 byte[] idata = new byte[(int)AssetResponse.ContentLength]; 77 byte[] idata = new byte[(int)AssetResponse.ContentLength];
diff --git a/OpenSim/OpenSim.GridInterfaces/Remote/RemoteGridServer.cs b/OpenSim/OpenSim.GridInterfaces/Remote/RemoteGridServer.cs
index 7f911d8..1995b21 100644
--- a/OpenSim/OpenSim.GridInterfaces/Remote/RemoteGridServer.cs
+++ b/OpenSim/OpenSim.GridInterfaces/Remote/RemoteGridServer.cs
@@ -35,6 +35,7 @@ using libsecondlife;
35using Nwc.XmlRpc; 35using Nwc.XmlRpc;
36using OpenSim.Framework.Interfaces; 36using OpenSim.Framework.Interfaces;
37using OpenSim.Framework.Types; 37using OpenSim.Framework.Types;
38using OpenSim.Framework.Console;
38 39
39namespace OpenSim.GridInterfaces.Remote 40namespace OpenSim.GridInterfaces.Remote
40{ 41{
@@ -68,7 +69,7 @@ namespace OpenSim.GridInterfaces.Remote
68 69
69 public RemoteGridServer() 70 public RemoteGridServer()
70 { 71 {
71 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Remote Grid Server class created"); 72 MainConsole.Instance.Notice("Remote Grid Server class created");
72 } 73 }
73 74
74 public override bool RequestConnection(LLUUID SimUUID, string sim_ip, uint sim_port) 75 public override bool RequestConnection(LLUUID SimUUID, string sim_ip, uint sim_port)
@@ -89,8 +90,8 @@ namespace OpenSim.GridInterfaces.Remote
89 if (GridRespData.ContainsKey("error")) 90 if (GridRespData.ContainsKey("error"))
90 { 91 {
91 string errorstring = (string)GridRespData["error"]; 92 string errorstring = (string)GridRespData["error"];
92 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "Error connecting to grid:"); 93 MainConsole.Instance.Warn("Error connecting to grid:");
93 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, errorstring); 94 MainConsole.Instance.Warn(errorstring);
94 return false; 95 return false;
95 } 96 }
96 this.neighbours = (ArrayList)GridRespData["neighbours"]; 97 this.neighbours = (ArrayList)GridRespData["neighbours"];
diff --git a/OpenSim/OpenSim.Physics/Manager/PhysicsManager.cs b/OpenSim/OpenSim.Physics/Manager/PhysicsManager.cs
index 291fc7e..2d96c4d 100644
--- a/OpenSim/OpenSim.Physics/Manager/PhysicsManager.cs
+++ b/OpenSim/OpenSim.Physics/Manager/PhysicsManager.cs
@@ -55,12 +55,12 @@ namespace OpenSim.Physics.Manager
55 55
56 if(_plugins.ContainsKey(engineName)) 56 if(_plugins.ContainsKey(engineName))
57 { 57 {
58 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.LOW,"creating "+engineName); 58 MainConsole.Instance.Notice("creating "+engineName);
59 return _plugins[engineName].GetScene(); 59 return _plugins[engineName].GetScene();
60 } 60 }
61 else 61 else
62 { 62 {
63 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.MEDIUM,"couldn't find physicsEngine: {0}",engineName); 63 MainConsole.Instance.Warn("couldn't find physicsEngine: {0}",engineName);
64 throw new ArgumentException(String.Format("couldn't find physicsEngine: {0}",engineName)); 64 throw new ArgumentException(String.Format("couldn't find physicsEngine: {0}",engineName));
65 } 65 }
66 } 66 }
diff --git a/OpenSim/OpenSim.Physics/Manager/PhysicsScene.cs b/OpenSim/OpenSim.Physics/Manager/PhysicsScene.cs
index 7dab4e1..1eb73b8 100644
--- a/OpenSim/OpenSim.Physics/Manager/PhysicsScene.cs
+++ b/OpenSim/OpenSim.Physics/Manager/PhysicsScene.cs
@@ -68,7 +68,7 @@ namespace OpenSim.Physics.Manager
68 68
69 public override PhysicsActor AddAvatar(PhysicsVector position) 69 public override PhysicsActor AddAvatar(PhysicsVector position)
70 { 70 {
71 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.VERBOSE,"NullPhysicsScene : AddAvatar({0})", position); 71 MainConsole.Instance.Verbose("NullPhysicsScene : AddAvatar({0})", position);
72 return PhysicsActor.Null; 72 return PhysicsActor.Null;
73 } 73 }
74 74
@@ -79,7 +79,7 @@ namespace OpenSim.Physics.Manager
79 79
80 public override PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size) 80 public override PhysicsActor AddPrim(PhysicsVector position, PhysicsVector size)
81 { 81 {
82 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.VERBOSE, "NullPhysicsScene : AddPrim({0},{1})", position, size); 82 MainConsole.Instance.Verbose( "NullPhysicsScene : AddPrim({0},{1})", position, size);
83 return PhysicsActor.Null; 83 return PhysicsActor.Null;
84 } 84 }
85 85
@@ -92,12 +92,12 @@ namespace OpenSim.Physics.Manager
92 92
93 public override void GetResults() 93 public override void GetResults()
94 { 94 {
95 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.VERBOSE, "NullPhysicsScene : GetResults()"); 95 MainConsole.Instance.Verbose( "NullPhysicsScene : GetResults()");
96 } 96 }
97 97
98 public override void SetTerrain(float[] heightMap) 98 public override void SetTerrain(float[] heightMap)
99 { 99 {
100 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(LogPriority.VERBOSE, "NullPhysicsScene : SetTerrain({0} items)", heightMap.Length); 100 MainConsole.Instance.Verbose( "NullPhysicsScene : SetTerrain({0} items)", heightMap.Length);
101 } 101 }
102 102
103 public override void DeleteTerrain() 103 public override void DeleteTerrain()
diff --git a/OpenSim/OpenSim.RegionServer/Assets/AssetCache.cs b/OpenSim/OpenSim.RegionServer/Assets/AssetCache.cs
index f66fa80..b98eac9 100644
--- a/OpenSim/OpenSim.RegionServer/Assets/AssetCache.cs
+++ b/OpenSim/OpenSim.RegionServer/Assets/AssetCache.cs
@@ -34,6 +34,7 @@ using OpenSim;
34using OpenSim.Framework.Interfaces; 34using OpenSim.Framework.Interfaces;
35using OpenSim.Framework.Types; 35using OpenSim.Framework.Types;
36using OpenSim.Framework.Utilities; 36using OpenSim.Framework.Utilities;
37using OpenSim.Framework.Console;
37 38
38namespace OpenSim.Assets 39namespace OpenSim.Assets
39{ 40{
@@ -60,7 +61,7 @@ namespace OpenSim.Assets
60 /// </summary> 61 /// </summary>
61 public AssetCache(IAssetServer assetServer) 62 public AssetCache(IAssetServer assetServer)
62 { 63 {
63 Console.WriteLine("Creating Asset cache"); 64 MainConsole.Instance.Verbose("Creating Asset cache");
64 _assetServer = assetServer; 65 _assetServer = assetServer;
65 _assetServer.SetReceiver(this); 66 _assetServer.SetReceiver(this);
66 Assets = new Dictionary<libsecondlife.LLUUID, AssetInfo>(); 67 Assets = new Dictionary<libsecondlife.LLUUID, AssetInfo>();
@@ -86,7 +87,7 @@ namespace OpenSim.Assets
86 } 87 }
87 catch (Exception e) 88 catch (Exception e)
88 { 89 {
89 Console.WriteLine(e.Message); 90 MainConsole.Instance.Error(e.Message);
90 } 91 }
91 } 92 }
92 } 93 }
diff --git a/OpenSim/OpenSim.RegionServer/ClientView.Grid.cs b/OpenSim/OpenSim.RegionServer/ClientView.Grid.cs
index 5229dbd..e59229a 100644
--- a/OpenSim/OpenSim.RegionServer/ClientView.Grid.cs
+++ b/OpenSim/OpenSim.RegionServer/ClientView.Grid.cs
@@ -15,6 +15,7 @@ using OpenSim.Framework.Inventory;
15using OpenSim.Framework.Utilities; 15using OpenSim.Framework.Utilities;
16using OpenSim.world; 16using OpenSim.world;
17using OpenSim.Assets; 17using OpenSim.Assets;
18using OpenSim.Framework.Console;
18 19
19namespace OpenSim 20namespace OpenSim
20{ 21{
@@ -42,7 +43,7 @@ namespace OpenSim
42 ushort neighbourPort = (ushort)Convert.ToInt32(neighbour["sim_port"]); 43 ushort neighbourPort = (ushort)Convert.ToInt32(neighbour["sim_port"]);
43 string reqUrl = "http://" + neighbourIPStr + ":" + neighbourPort.ToString(); 44 string reqUrl = "http://" + neighbourIPStr + ":" + neighbourPort.ToString();
44 45
45 Console.WriteLine(reqUrl); 46 MainConsole.Instance.Verbose("Requesting " + reqUrl);
46 47
47 SimParams = new Hashtable(); 48 SimParams = new Hashtable();
48 SimParams["session_id"] = this.SessionID.ToString(); 49 SimParams["session_id"] = this.SessionID.ToString();
@@ -72,7 +73,7 @@ namespace OpenSim
72 } 73 }
73 catch (Exception e) 74 catch (Exception e)
74 { 75 {
75 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Could not connect to neighbour " + neighbour["sim_ip"] + ":" + neighbour["sim_port"] + ", continuing."); 76 MainConsole.Instance.Notice("Could not connect to neighbour " + neighbour["sim_ip"] + ":" + neighbour["sim_port"] + ", continuing.");
76 } 77 }
77 } 78 }
78 Thread.Sleep(3000); 79 Thread.Sleep(3000);
@@ -112,7 +113,7 @@ namespace OpenSim
112 neighboury += 1; 113 neighboury += 1;
113 newpos.Y = 1; 114 newpos.Y = 1;
114 } 115 }
115 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "SimClient.cs:CrossSimBorder() - Crossing border to neighbouring sim at [" + neighbourx.ToString() + "," + neighboury.ToString() + "]"); 116 MainConsole.Instance.Notice("SimClient.cs:CrossSimBorder() - Crossing border to neighbouring sim at [" + neighbourx.ToString() + "," + neighboury.ToString() + "]");
116 117
117 Hashtable SimParams; 118 Hashtable SimParams;
118 ArrayList SendParams; 119 ArrayList SendParams;
diff --git a/OpenSim/OpenSim.RegionServer/ClientView.PacketHandlers.cs b/OpenSim/OpenSim.RegionServer/ClientView.PacketHandlers.cs
index 7928817..f21efaf 100644
--- a/OpenSim/OpenSim.RegionServer/ClientView.PacketHandlers.cs
+++ b/OpenSim/OpenSim.RegionServer/ClientView.PacketHandlers.cs
@@ -15,6 +15,7 @@ using OpenSim.Framework.Inventory;
15using OpenSim.Framework.Utilities; 15using OpenSim.Framework.Utilities;
16using OpenSim.world; 16using OpenSim.world;
17using OpenSim.Assets; 17using OpenSim.Assets;
18using OpenSim.Framework.Console;
18 19
19namespace OpenSim 20namespace OpenSim
20{ 21{
@@ -29,7 +30,7 @@ namespace OpenSim
29 30
30 protected virtual bool Logout(ClientView simClient, Packet packet) 31 protected virtual bool Logout(ClientView simClient, Packet packet)
31 { 32 {
32 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "OpenSimClient.cs:ProcessInPacket() - Got a logout request"); 33 MainConsole.Instance.Notice("OpenSimClient.cs:ProcessInPacket() - Got a logout request");
33 //send reply to let the client logout 34 //send reply to let the client logout
34 LogoutReplyPacket logReply = new LogoutReplyPacket(); 35 LogoutReplyPacket logReply = new LogoutReplyPacket();
35 logReply.AgentData.AgentID = this.AgentID; 36 logReply.AgentData.AgentID = this.AgentID;
diff --git a/OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs b/OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs
index 19d222c..7cb2727 100644
--- a/OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs
+++ b/OpenSim/OpenSim.RegionServer/ClientView.ProcessPackets.cs
@@ -16,6 +16,7 @@ using OpenSim.Framework.Utilities;
16using OpenSim.world; 16using OpenSim.world;
17using OpenSim.RegionServer.world; 17using OpenSim.RegionServer.world;
18using OpenSim.Assets; 18using OpenSim.Assets;
19using OpenSim.Framework.Console;
19 20
20namespace OpenSim 21namespace OpenSim
21{ 22{
@@ -464,7 +465,7 @@ namespace OpenSim
464 outgoing.MoneyData.TransactionSuccess = true; 465 outgoing.MoneyData.TransactionSuccess = true;
465 outgoing.MoneyData.Description = libsecondlife.Helpers.StringToField(""); 466 outgoing.MoneyData.Description = libsecondlife.Helpers.StringToField("");
466 this.OutPacket((Packet)outgoing); 467 this.OutPacket((Packet)outgoing);
467 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Sent Temporary Money packet (they have leet monies)"); 468 MainConsole.Instance.Notice("Sent Temporary Money packet (they have leet monies)");
468 469
469 break; 470 break;
470 471
@@ -477,7 +478,7 @@ namespace OpenSim
477 estateCovenantReply.Data.CovenantID = LLUUID.Zero; 478 estateCovenantReply.Data.CovenantID = LLUUID.Zero;
478 estateCovenantReply.Data.CovenantTimestamp = (uint)0; 479 estateCovenantReply.Data.CovenantTimestamp = (uint)0;
479 this.OutPacket((Packet)estateCovenantReply); 480 this.OutPacket((Packet)estateCovenantReply);
480 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Sent Temporary Estate packet (they are in leet estate)"); 481 MainConsole.Instance.Notice("Sent Temporary Estate packet (they are in leet estate)");
481 break; 482 break;
482 #endregion 483 #endregion
483 } 484 }
diff --git a/OpenSim/OpenSim.RegionServer/ClientView.cs b/OpenSim/OpenSim.RegionServer/ClientView.cs
index 8f7cf58..bf6b72e 100644
--- a/OpenSim/OpenSim.RegionServer/ClientView.cs
+++ b/OpenSim/OpenSim.RegionServer/ClientView.cs
@@ -41,6 +41,7 @@ using OpenSim.Framework.Inventory;
41using OpenSim.Framework.Utilities; 41using OpenSim.Framework.Utilities;
42using OpenSim.world; 42using OpenSim.world;
43using OpenSim.Assets; 43using OpenSim.Assets;
44using OpenSim.Framework.Console;
44 45
45namespace OpenSim 46namespace OpenSim
46{ 47{
@@ -110,7 +111,7 @@ namespace OpenSim
110 m_child = child; 111 m_child = child;
111 m_regionData = regionDat; 112 m_regionData = regionDat;
112 m_authenticateSessionsHandler = authenSessions; 113 m_authenticateSessionsHandler = authenSessions;
113 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "OpenSimClient.cs - Started up new client thread to handle incoming request"); 114 MainConsole.Instance.Notice("OpenSimClient.cs - Started up new client thread to handle incoming request");
114 cirpack = initialcirpack; 115 cirpack = initialcirpack;
115 userEP = remoteEP; 116 userEP = remoteEP;
116 117
@@ -150,7 +151,7 @@ namespace OpenSim
150 # region Client Methods 151 # region Client Methods
151 public void UpgradeClient() 152 public void UpgradeClient()
152 { 153 {
153 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "SimClient.cs:UpgradeClient() - upgrading child to full agent"); 154 MainConsole.Instance.Notice("SimClient.cs:UpgradeClient() - upgrading child to full agent");
154 this.m_child = false; 155 this.m_child = false;
155 //this.m_world.RemoveViewerAgent(this); 156 //this.m_world.RemoveViewerAgent(this);
156 if (!this.m_sandboxMode) 157 if (!this.m_sandboxMode)
@@ -164,7 +165,7 @@ namespace OpenSim
164 165
165 public void DowngradeClient() 166 public void DowngradeClient()
166 { 167 {
167 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "SimClient.cs:UpgradeClient() - changing full agent to child"); 168 MainConsole.Instance.Notice("SimClient.cs:UpgradeClient() - changing full agent to child");
168 this.m_child = true; 169 this.m_child = true;
169 OnChildAgentStatus(this.m_child); 170 OnChildAgentStatus(this.m_child);
170 //this.m_world.RemoveViewerAgent(this); 171 //this.m_world.RemoveViewerAgent(this);
@@ -254,7 +255,7 @@ namespace OpenSim
254 255
255 protected virtual void ClientLoop() 256 protected virtual void ClientLoop()
256 { 257 {
257 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "OpenSimClient.cs:ClientLoop() - Entered loop"); 258 MainConsole.Instance.Notice("OpenSimClient.cs:ClientLoop() - Entered loop");
258 while (true) 259 while (true)
259 { 260 {
260 QueItem nextPacket = PacketQueue.Dequeue(); 261 QueItem nextPacket = PacketQueue.Dequeue();
@@ -276,7 +277,7 @@ namespace OpenSim
276 277
277 protected virtual void InitNewClient() 278 protected virtual void InitNewClient()
278 { 279 {
279 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "OpenSimClient.cs:InitNewClient() - Adding viewer agent to world"); 280 MainConsole.Instance.Notice("OpenSimClient.cs:InitNewClient() - Adding viewer agent to world");
280 this.ClientAvatar = m_world.AddViewerAgent(this); 281 this.ClientAvatar = m_world.AddViewerAgent(this);
281 } 282 }
282 283
@@ -287,12 +288,12 @@ namespace OpenSim
287 if (!sessionInfo.Authorised) 288 if (!sessionInfo.Authorised)
288 { 289 {
289 //session/circuit not authorised 290 //session/circuit not authorised
290 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.NORMAL, "OpenSimClient.cs:AuthUser() - New user request denied to " + userEP.ToString()); 291 OpenSim.Framework.Console.MainConsole.Instance.Notice("OpenSimClient.cs:AuthUser() - New user request denied to " + userEP.ToString());
291 ClientThread.Abort(); 292 ClientThread.Abort();
292 } 293 }
293 else 294 else
294 { 295 {
295 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.NORMAL, "OpenSimClient.cs:AuthUser() - Got authenticated connection from " + userEP.ToString()); 296 OpenSim.Framework.Console.MainConsole.Instance.Notice("OpenSimClient.cs:AuthUser() - Got authenticated connection from " + userEP.ToString());
296 //session is authorised 297 //session is authorised
297 this.AgentID = cirpack.CircuitCode.ID; 298 this.AgentID = cirpack.CircuitCode.ID;
298 this.SessionID = cirpack.CircuitCode.SessionID; 299 this.SessionID = cirpack.CircuitCode.SessionID;
@@ -396,7 +397,7 @@ namespace OpenSim
396 if (this.m_userServer != null) 397 if (this.m_userServer != null)
397 { 398 {
398 // a user server is set so request the inventory from it 399 // a user server is set so request the inventory from it
399 Console.WriteLine("getting inventory from user server"); 400 MainConsole.Instance.Verbose("getting inventory from user server");
400 inventory = m_inventoryCache.FetchAgentsInventory(this.AgentID, m_userServer); 401 inventory = m_inventoryCache.FetchAgentsInventory(this.AgentID, m_userServer);
401 } 402 }
402 else 403 else
@@ -414,7 +415,7 @@ namespace OpenSim
414 { 415 {
415 if (!(packet.InventoryBlock.Type == 3 || packet.InventoryBlock.Type == 7)) 416 if (!(packet.InventoryBlock.Type == 3 || packet.InventoryBlock.Type == 7))
416 { 417 {
417 System.Console.WriteLine("Attempted to create " + Util.FieldToString(packet.InventoryBlock.Name) + " in inventory. Unsupported type"); 418 MainConsole.Instance.Warn("Attempted to create " + Util.FieldToString(packet.InventoryBlock.Name) + " in inventory. Unsupported type");
418 return; 419 return;
419 } 420 }
420 421
diff --git a/OpenSim/OpenSim.RegionServer/ClientViewBase.cs b/OpenSim/OpenSim.RegionServer/ClientViewBase.cs
index 642251c..1eee329 100644
--- a/OpenSim/OpenSim.RegionServer/ClientViewBase.cs
+++ b/OpenSim/OpenSim.RegionServer/ClientViewBase.cs
@@ -10,6 +10,7 @@ using System.Threading;
10using System.Timers; 10using System.Timers;
11using OpenSim.Framework.Utilities; 11using OpenSim.Framework.Utilities;
12using OpenSim.Framework.Interfaces; 12using OpenSim.Framework.Interfaces;
13using OpenSim.Framework.Console;
13 14
14namespace OpenSim 15namespace OpenSim
15{ 16{
@@ -132,7 +133,7 @@ namespace OpenSim
132 } 133 }
133 catch (Exception) 134 catch (Exception)
134 { 135 {
135 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "OpenSimClient.cs:ProcessOutPacket() - WARNING: Socket exception occurred on connection " + userEP.ToString() + " - killing thread"); 136 MainConsole.Instance.Warn("OpenSimClient.cs:ProcessOutPacket() - WARNING: Socket exception occurred on connection " + userEP.ToString() + " - killing thread");
136 this.KillThread(); 137 this.KillThread();
137 } 138 }
138 139
@@ -227,7 +228,7 @@ namespace OpenSim
227 { 228 {
228 if ((now - packet.TickCount > RESEND_TIMEOUT) && (!packet.Header.Resent)) 229 if ((now - packet.TickCount > RESEND_TIMEOUT) && (!packet.Header.Resent))
229 { 230 {
230 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.VERBOSE, "Resending " + packet.Type.ToString() + " packet, " + 231 OpenSim.Framework.Console.MainConsole.Instance.Verbose("Resending " + packet.Type.ToString() + " packet, " +
231 (now - packet.TickCount) + "ms have passed"); 232 (now - packet.TickCount) + "ms have passed");
232 233
233 packet.Header.Resent = true; 234 packet.Header.Resent = true;
@@ -246,7 +247,7 @@ namespace OpenSim
246 if (PendingAcks.Count > 250) 247 if (PendingAcks.Count > 250)
247 { 248 {
248 // FIXME: Handle the odd case where we have too many pending ACKs queued up 249 // FIXME: Handle the odd case where we have too many pending ACKs queued up
249 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.VERBOSE, "Too many ACKs queued up!"); 250 OpenSim.Framework.Console.MainConsole.Instance.Verbose("Too many ACKs queued up!");
250 return; 251 return;
251 } 252 }
252 253
diff --git a/OpenSim/OpenSim.RegionServer/OpenSimMain.cs b/OpenSim/OpenSim.RegionServer/OpenSimMain.cs
index 003412d..59d3424 100644
--- a/OpenSim/OpenSim.RegionServer/OpenSimMain.cs
+++ b/OpenSim/OpenSim.RegionServer/OpenSimMain.cs
@@ -89,7 +89,7 @@ namespace OpenSim
89 { 89 {
90 this.SetupFromConfigFile(this.localConfig); 90 this.SetupFromConfigFile(this.localConfig);
91 } 91 }
92 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Startup() - Loading configuration"); 92 m_console.Notice("Main.cs:Startup() - Loading configuration");
93 this.regionData.InitConfig(this.m_sandbox, this.localConfig); 93 this.regionData.InitConfig(this.m_sandbox, this.localConfig);
94 this.localConfig.Close();//for now we can close it as no other classes read from it , but this should change 94 this.localConfig.Close();//for now we can close it as no other classes read from it , but this should change
95 95
@@ -118,7 +118,7 @@ namespace OpenSim
118 } 118 }
119 catch (Exception e) 119 catch (Exception e)
120 { 120 {
121 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, e.Message + "\nSorry, could not setup local cache"); 121 m_console.Error(e.Message + "\nSorry, could not setup local cache");
122 Environment.Exit(1); 122 Environment.Exit(1);
123 } 123 }
124 124
@@ -141,7 +141,7 @@ namespace OpenSim
141 AssetCache.LoadDefaultTextureSet(); 141 AssetCache.LoadDefaultTextureSet();
142 } 142 }
143 143
144 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Startup() - Initialising HTTP server"); 144 m_console.Notice("Main.cs:Startup() - Initialising HTTP server");
145 145
146 this.SetupHttpListener(); 146 this.SetupHttpListener();
147 147
@@ -173,7 +173,7 @@ namespace OpenSim
173 AdminWebFront adminWebFront = new AdminWebFront("Admin", LocalWorld, InventoryCache, adminLoginServer); 173 AdminWebFront adminWebFront = new AdminWebFront("Admin", LocalWorld, InventoryCache, adminLoginServer);
174 adminWebFront.LoadMethods(httpServer); 174 adminWebFront.LoadMethods(httpServer);
175 175
176 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Startup() - Starting HTTP server"); 176 m_console.Notice("Main.cs:Startup() - Starting HTTP server");
177 httpServer.Start(); 177 httpServer.Start();
178 178
179 //MainServerListener(); 179 //MainServerListener();
@@ -190,7 +190,7 @@ namespace OpenSim
190 GridServers.AssetDll = "OpenSim.GridInterfaces.Local.dll"; 190 GridServers.AssetDll = "OpenSim.GridInterfaces.Local.dll";
191 GridServers.GridDll = "OpenSim.GridInterfaces.Local.dll"; 191 GridServers.GridDll = "OpenSim.GridInterfaces.Local.dll";
192 192
193 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Starting in Sandbox mode"); 193 m_console.Notice("Starting in Sandbox mode");
194 194
195 try 195 try
196 { 196 {
@@ -198,7 +198,7 @@ namespace OpenSim
198 } 198 }
199 catch (Exception e) 199 catch (Exception e)
200 { 200 {
201 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, e.Message + "\nSorry, could not setup the grid interface"); 201 m_console.Error(e.Message + "\nSorry, could not setup the grid interface");
202 Environment.Exit(1); 202 Environment.Exit(1);
203 } 203 }
204 } 204 }
@@ -215,7 +215,7 @@ namespace OpenSim
215 } 215 }
216 GridServers.GridDll = "OpenSim.GridInterfaces.Remote.dll"; 216 GridServers.GridDll = "OpenSim.GridInterfaces.Remote.dll";
217 217
218 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Starting in Grid mode"); 218 m_console.Notice("Starting in Grid mode");
219 219
220 try 220 try
221 { 221 {
@@ -223,15 +223,15 @@ namespace OpenSim
223 } 223 }
224 catch (Exception e) 224 catch (Exception e)
225 { 225 {
226 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, e.Message + "\nSorry, could not setup the grid interface"); 226 m_console.Error(e.Message + "\nSorry, could not setup the grid interface");
227 Environment.Exit(1); 227 Environment.Exit(1);
228 } 228 }
229 } 229 }
230 230
231 protected virtual void SetupLocalWorld() 231 protected virtual void SetupLocalWorld()
232 { 232 {
233 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.NORMAL, "Main.cs:Startup() - We are " + regionData.RegionName + " at " + regionData.RegionLocX.ToString() + "," + regionData.RegionLocY.ToString()); 233 m_console.Notice("Main.cs:Startup() - We are " + regionData.RegionName + " at " + regionData.RegionLocX.ToString() + "," + regionData.RegionLocY.ToString());
234 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Initialising world"); 234 m_console.Notice("Initialising world");
235 m_console.componentname = "Region " + regionData.RegionName; 235 m_console.componentname = "Region " + regionData.RegionName;
236 236
237 m_localWorld = new World(this.m_udpServer.PacketServer.ClientThreads, regionData, regionData.RegionHandle, regionData.RegionName); 237 m_localWorld = new World(this.m_udpServer.PacketServer.ClientThreads, regionData, regionData.RegionHandle, regionData.RegionName);
@@ -249,7 +249,7 @@ namespace OpenSim
249 LocalWorld.LoadStorageDLL("OpenSim.Storage.LocalStorageDb4o.dll"); //all these dll names shouldn't be hard coded. 249 LocalWorld.LoadStorageDLL("OpenSim.Storage.LocalStorageDb4o.dll"); //all these dll names shouldn't be hard coded.
250 LocalWorld.LoadWorldMap(); 250 LocalWorld.LoadWorldMap();
251 251
252 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Startup() - Starting up messaging system"); 252 m_console.Notice("Main.cs:Startup() - Starting up messaging system");
253 LocalWorld.PhysScene = this.physManager.GetPhysicsScene(this.m_physicsEngine); 253 LocalWorld.PhysScene = this.physManager.GetPhysicsScene(this.m_physicsEngine);
254 LocalWorld.PhysScene.SetTerrain(LocalWorld.Terrain.getHeights1D()); 254 LocalWorld.PhysScene.SetTerrain(LocalWorld.Terrain.getHeights1D());
255 LocalWorld.LoadPrimsFromStorage(); 255 LocalWorld.LoadPrimsFromStorage();
@@ -297,7 +297,7 @@ namespace OpenSim
297 { 297 {
298 if (GridServers.GridServer.RequestConnection(regionData.SimUUID, regionData.IPListenAddr, (uint)regionData.IPListenPort)) 298 if (GridServers.GridServer.RequestConnection(regionData.SimUUID, regionData.IPListenAddr, (uint)regionData.IPListenPort))
299 { 299 {
300 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Startup() - Success: Got a grid connection OK!"); 300 m_console.Notice("Main.cs:Startup() - Success: Got a grid connection OK!");
301 } 301 }
302 else 302 else
303 { 303 {
@@ -397,7 +397,7 @@ namespace OpenSim
397 switch (attri) 397 switch (attri)
398 { 398 {
399 default: 399 default:
400 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "Main.cs: SetupFromConfig() - Invalid value for PhysicsEngine attribute, terminating"); 400 m_console.Warn("Main.cs: SetupFromConfig() - Invalid value for PhysicsEngine attribute, terminating");
401 Environment.Exit(1); 401 Environment.Exit(1);
402 break; 402 break;
403 403
@@ -440,11 +440,11 @@ namespace OpenSim
440 /// </summary> 440 /// </summary>
441 public virtual void Shutdown() 441 public virtual void Shutdown()
442 { 442 {
443 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Shutdown() - Closing all threads"); 443 m_console.Notice("Main.cs:Shutdown() - Closing all threads");
444 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Shutdown() - Killing listener thread"); 444 m_console.Notice("Main.cs:Shutdown() - Killing listener thread");
445 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Shutdown() - Killing clients"); 445 m_console.Notice("Main.cs:Shutdown() - Killing clients");
446 // IMPLEMENT THIS 446 // IMPLEMENT THIS
447 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Shutdown() - Closing console and terminating"); 447 m_console.Notice("Main.cs:Shutdown() - Closing console and terminating");
448 LocalWorld.Close(); 448 LocalWorld.Close();
449 GridServers.Close(); 449 GridServers.Close();
450 m_console.Close(); 450 m_console.Close();
@@ -472,8 +472,8 @@ namespace OpenSim
472 switch (command) 472 switch (command)
473 { 473 {
474 case "help": 474 case "help":
475 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, "show users - show info about connected users"); 475 m_console.Error("show users - show info about connected users");
476 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, "shutdown - disconnect all clients and shutdown"); 476 m_console.Error("shutdown - disconnect all clients and shutdown");
477 break; 477 break;
478 478
479 case "show": 479 case "show":
@@ -484,7 +484,7 @@ namespace OpenSim
484 string result = ""; 484 string result = "";
485 if (!LocalWorld.Terrain.RunTerrainCmd(cmdparams, ref result)) 485 if (!LocalWorld.Terrain.RunTerrainCmd(cmdparams, ref result))
486 { 486 {
487 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, result); 487 m_console.Error(result);
488 } 488 }
489 break; 489 break;
490 490
@@ -493,7 +493,7 @@ namespace OpenSim
493 break; 493 break;
494 494
495 default: 495 default:
496 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, "Unknown command"); 496 m_console.Error("Unknown command");
497 break; 497 break;
498 } 498 }
499 } 499 }
@@ -507,18 +507,18 @@ namespace OpenSim
507 switch (ShowWhat) 507 switch (ShowWhat)
508 { 508 {
509 case "uptime": 509 case "uptime":
510 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, "OpenSim has been running since " + startuptime.ToString()); 510 m_console.Error("OpenSim has been running since " + startuptime.ToString());
511 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, "That is " + (DateTime.Now - startuptime).ToString()); 511 m_console.Error("That is " + (DateTime.Now - startuptime).ToString());
512 break; 512 break;
513 case "users": 513 case "users":
514 OpenSim.world.Avatar TempAv; 514 OpenSim.world.Avatar TempAv;
515 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")); 515 m_console.Error(String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16}{5,-16}", "Firstname", "Lastname", "Agent ID", "Session ID", "Circuit", "IP"));
516 foreach (libsecondlife.LLUUID UUID in LocalWorld.Entities.Keys) 516 foreach (libsecondlife.LLUUID UUID in LocalWorld.Entities.Keys)
517 { 517 {
518 if (LocalWorld.Entities[UUID].ToString() == "OpenSim.world.Avatar") 518 if (LocalWorld.Entities[UUID].ToString() == "OpenSim.world.Avatar")
519 { 519 {
520 TempAv = (OpenSim.world.Avatar)LocalWorld.Entities[UUID]; 520 TempAv = (OpenSim.world.Avatar)LocalWorld.Entities[UUID];
521 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())); 521 m_console.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()));
522 } 522 }
523 } 523 }
524 break; 524 break;
diff --git a/OpenSim/OpenSim.RegionServer/RegionInfo.cs b/OpenSim/OpenSim.RegionServer/RegionInfo.cs
index 6bd8f08..0e75d8b 100644
--- a/OpenSim/OpenSim.RegionServer/RegionInfo.cs
+++ b/OpenSim/OpenSim.RegionServer/RegionInfo.cs
@@ -82,7 +82,7 @@ namespace OpenSim
82 stIn.Close(); 82 stIn.Close();
83 gridresp.Close(); 83 gridresp.Close();
84 84
85 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"RegionInfo.CS:SaveToGrid() - Grid said: " + GridResponse); 85 OpenSim.Framework.Console.MainConsole.Instance.Verbose("RegionInfo.CS:SaveToGrid() - Grid said: " + GridResponse);
86 } 86 }
87 87
88 public void InitConfig(bool sandboxMode, IGenericConfig configData) 88 public void InitConfig(bool sandboxMode, IGenericConfig configData)
@@ -333,21 +333,21 @@ namespace OpenSim
333 } 333 }
334 catch (Exception e) 334 catch (Exception e)
335 { 335 {
336 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,"Config.cs:InitConfig() - Exception occured"); 336 OpenSim.Framework.Console.MainConsole.Instance.Warn("Config.cs:InitConfig() - Exception occured");
337 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,e.ToString()); 337 OpenSim.Framework.Console.MainConsole.Instance.Warn(e.ToString());
338 } 338 }
339 339
340 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Simulator Settings Loaded"); 340 OpenSim.Framework.Console.MainConsole.Instance.Verbose("Simulator Settings Loaded");
341 /* OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "UUID: " + this.SimUUID.ToStringHyphenated()); 341 /* MainConsole.Instance.Notice("UUID: " + this.SimUUID.ToStringHyphenated());
342 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Name: " + this.RegionName); 342 MainConsole.Instance.Notice("Name: " + this.RegionName);
343 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Region Location: [" + this.RegionLocX.ToString() + "," + this.RegionLocY + "]"); 343 MainConsole.Instance.Notice("Region Location: [" + this.RegionLocX.ToString() + "," + this.RegionLocY + "]");
344 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Region Handle: " + this.RegionHandle.ToString()); 344 MainConsole.Instance.Notice("Region Handle: " + this.RegionHandle.ToString());
345 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Listening on IP: " + this.IPListenAddr + ":" + this.IPListenPort); 345 MainConsole.Instance.Notice("Listening on IP: " + this.IPListenAddr + ":" + this.IPListenPort);
346 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Sandbox Mode? " + isSandbox.ToString()); 346 MainConsole.Instance.Notice("Sandbox Mode? " + isSandbox.ToString());
347 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Asset URL: " + this.AssetURL); 347 MainConsole.Instance.Notice("Asset URL: " + this.AssetURL);
348 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Asset key: " + this.AssetSendKey); 348 MainConsole.Instance.Notice("Asset key: " + this.AssetSendKey);
349 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Grid URL: " + this.GridURL); 349 MainConsole.Instance.Notice("Grid URL: " + this.GridURL);
350 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Grid key: " + this.GridSendKey); */ 350 MainConsole.Instance.Notice("Grid key: " + this.GridSendKey); */
351 } 351 }
352 } 352 }
353} 353}
diff --git a/OpenSim/OpenSim.RegionServer/UDPServer.cs b/OpenSim/OpenSim.RegionServer/UDPServer.cs
index 3a93e66..ac65a93 100644
--- a/OpenSim/OpenSim.RegionServer/UDPServer.cs
+++ b/OpenSim/OpenSim.RegionServer/UDPServer.cs
@@ -144,20 +144,20 @@ namespace OpenSim
144 144
145 public void ServerListener() 145 public void ServerListener()
146 { 146 {
147 m_console.WriteLine("UDPServer.cs:ServerListener() - Opening UDP socket on " + listenPort); 147 m_console.Notice("UDPServer.cs:ServerListener() - Opening UDP socket on " + listenPort);
148 148
149 ServerIncoming = new IPEndPoint(IPAddress.Any, listenPort); 149 ServerIncoming = new IPEndPoint(IPAddress.Any, listenPort);
150 Server = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp); 150 Server = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp);
151 Server.Bind(ServerIncoming); 151 Server.Bind(ServerIncoming);
152 152
153 m_console.WriteLine("UDPServer.cs:ServerListener() - UDP socket bound, getting ready to listen"); 153 m_console.Notice("UDPServer.cs:ServerListener() - UDP socket bound, getting ready to listen");
154 154
155 ipeSender = new IPEndPoint(IPAddress.Any, 0); 155 ipeSender = new IPEndPoint(IPAddress.Any, 0);
156 epSender = (EndPoint)ipeSender; 156 epSender = (EndPoint)ipeSender;
157 ReceivedData = new AsyncCallback(this.OnReceivedData); 157 ReceivedData = new AsyncCallback(this.OnReceivedData);
158 Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null); 158 Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null);
159 159
160 m_console.WriteLine("UDPServer.cs:ServerListener() - Listening..."); 160 m_console.Notice("UDPServer.cs:ServerListener() - Listening...");
161 161
162 } 162 }
163 163
diff --git a/OpenSim/OpenSim.RegionServer/world/Avatar.cs b/OpenSim/OpenSim.RegionServer/world/Avatar.cs
index f9f3cc4..f7a5766 100644
--- a/OpenSim/OpenSim.RegionServer/world/Avatar.cs
+++ b/OpenSim/OpenSim.RegionServer/world/Avatar.cs
@@ -46,7 +46,7 @@ namespace OpenSim.world
46 m_regionTerraform = regionTerraform; 46 m_regionTerraform = regionTerraform;
47 m_regionWaterHeight = regionWater; 47 m_regionWaterHeight = regionWater;
48 48
49 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Avatar.cs - Loading details from grid (DUMMY)"); 49 OpenSim.Framework.Console.MainConsole.Instance.Verbose("Avatar.cs - Loading details from grid (DUMMY)");
50 ControllingClient = TheClient; 50 ControllingClient = TheClient;
51 localid = 8880000 + (this.m_world._localNumber++); 51 localid = 8880000 + (this.m_world._localNumber++);
52 Pos = ControllingClient.startpos; 52 Pos = ControllingClient.startpos;
@@ -211,7 +211,7 @@ namespace OpenSim.world
211 211
212 public void CompleteMovement() 212 public void CompleteMovement()
213 { 213 {
214 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.VERBOSE,"Avatar.cs:CompleteMovement() - Constructing AgentMovementComplete packet"); 214 OpenSim.Framework.Console.MainConsole.Instance.Verbose("Avatar.cs:CompleteMovement() - Constructing AgentMovementComplete packet");
215 AgentMovementCompletePacket mov = new AgentMovementCompletePacket(); 215 AgentMovementCompletePacket mov = new AgentMovementCompletePacket();
216 mov.AgentData.SessionID = this.ControllingClient.SessionID; 216 mov.AgentData.SessionID = this.ControllingClient.SessionID;
217 mov.AgentData.AgentID = this.ControllingClient.AgentID; 217 mov.AgentData.AgentID = this.ControllingClient.AgentID;
@@ -382,11 +382,11 @@ namespace OpenSim.world
382 //really really should be moved somewhere else (RegionInfo.cs ?) 382 //really really should be moved somewhere else (RegionInfo.cs ?)
383 public void SendRegionHandshake(World regionInfo) 383 public void SendRegionHandshake(World regionInfo)
384 { 384 {
385 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.VERBOSE,"Avatar.cs:SendRegionHandshake() - Creating empty RegionHandshake packet"); 385 OpenSim.Framework.Console.MainConsole.Instance.Verbose("Avatar.cs:SendRegionHandshake() - Creating empty RegionHandshake packet");
386 System.Text.Encoding _enc = System.Text.Encoding.ASCII; 386 System.Text.Encoding _enc = System.Text.Encoding.ASCII;
387 RegionHandshakePacket handshake = new RegionHandshakePacket(); 387 RegionHandshakePacket handshake = new RegionHandshakePacket();
388 388
389 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.VERBOSE,"Avatar.cs:SendRegionhandshake() - Filling in RegionHandshake details"); 389 OpenSim.Framework.Console.MainConsole.Instance.Verbose("Avatar.cs:SendRegionhandshake() - Filling in RegionHandshake details");
390 handshake.RegionInfo.BillableFactor = 0; 390 handshake.RegionInfo.BillableFactor = 0;
391 handshake.RegionInfo.IsEstateManager = false; 391 handshake.RegionInfo.IsEstateManager = false;
392 handshake.RegionInfo.TerrainHeightRange00 = regionInfo.m_regInfo.TerrainHeightRange00; 392 handshake.RegionInfo.TerrainHeightRange00 = regionInfo.m_regInfo.TerrainHeightRange00;
@@ -417,7 +417,7 @@ namespace OpenSim.world
417 handshake.RegionInfo.TerrainDetail3 = regionInfo.m_regInfo.TerrainDetail3; 417 handshake.RegionInfo.TerrainDetail3 = regionInfo.m_regInfo.TerrainDetail3;
418 handshake.RegionInfo.CacheID = new LLUUID("545ec0a5-5751-1026-8a0b-216e38a7ab37"); 418 handshake.RegionInfo.CacheID = new LLUUID("545ec0a5-5751-1026-8a0b-216e38a7ab37");
419 419
420 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.VERBOSE,"Avatar.cs:SendRegionHandshake() - Sending RegionHandshake packet"); 420 OpenSim.Framework.Console.MainConsole.Instance.Verbose("Avatar.cs:SendRegionHandshake() - Sending RegionHandshake packet");
421 this.ControllingClient.OutPacket(handshake); 421 this.ControllingClient.OutPacket(handshake);
422 } 422 }
423 423
diff --git a/OpenSim/OpenSim.RegionServer/world/AvatarAnimations.cs b/OpenSim/OpenSim.RegionServer/world/AvatarAnimations.cs
index 9e96a4e..2947b96 100644
--- a/OpenSim/OpenSim.RegionServer/world/AvatarAnimations.cs
+++ b/OpenSim/OpenSim.RegionServer/world/AvatarAnimations.cs
@@ -18,7 +18,7 @@ namespace OpenSim.world
18 18
19 public void LoadAnims() 19 public void LoadAnims()
20 { 20 {
21 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Avatar.cs:LoadAnims() - Loading avatar animations"); 21 OpenSim.Framework.Console.MainConsole.Instance.Verbose("Avatar.cs:LoadAnims() - Loading avatar animations");
22 XmlTextReader reader = new XmlTextReader("data/avataranimations.xml"); 22 XmlTextReader reader = new XmlTextReader("data/avataranimations.xml");
23 23
24 XmlDocument doc = new XmlDocument(); 24 XmlDocument doc = new XmlDocument();
@@ -35,7 +35,7 @@ namespace OpenSim.world
35 35
36 reader.Close(); 36 reader.Close();
37 37
38 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Loaded " + AnimsLLUUID.Count.ToString() + " animation(s)"); 38 OpenSim.Framework.Console.MainConsole.Instance.Verbose("Loaded " + AnimsLLUUID.Count.ToString() + " animation(s)");
39 39
40 foreach (KeyValuePair<string, LLUUID> kp in OpenSim.world.Avatar.Animations.AnimsLLUUID) 40 foreach (KeyValuePair<string, LLUUID> kp in OpenSim.world.Avatar.Animations.AnimsLLUUID)
41 { 41 {
diff --git a/OpenSim/OpenSim.RegionServer/world/World.PacketHandlers.cs b/OpenSim/OpenSim.RegionServer/world/World.PacketHandlers.cs
index 8924773..6bf1598 100644
--- a/OpenSim/OpenSim.RegionServer/world/World.PacketHandlers.cs
+++ b/OpenSim/OpenSim.RegionServer/world/World.PacketHandlers.cs
@@ -113,7 +113,7 @@ namespace OpenSim.world
113 //Uncomment when prim/object UUIDs are random or such 113 //Uncomment when prim/object UUIDs are random or such
114 //2007-03-22 - Randomskk 114 //2007-03-22 - Randomskk
115 //this._primCount--; 115 //this._primCount--;
116 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.VERBOSE, "Deleted UUID " + ent.uuid); 116 OpenSim.Framework.Console.MainConsole.Instance.Verbose("Deleted UUID " + ent.uuid);
117 } 117 }
118 } 118 }
119 } 119 }
diff --git a/OpenSim/OpenSim.RegionServer/world/World.cs b/OpenSim/OpenSim.RegionServer/world/World.cs
index 92de6f0..1f15e9c 100644
--- a/OpenSim/OpenSim.RegionServer/world/World.cs
+++ b/OpenSim/OpenSim.RegionServer/world/World.cs
@@ -15,6 +15,7 @@ using OpenSim.Assets;
15//using OpenSim.world.scripting; 15//using OpenSim.world.scripting;
16using OpenSim.RegionServer.world.scripting; 16using OpenSim.RegionServer.world.scripting;
17using OpenSim.Terrain; 17using OpenSim.Terrain;
18using OpenSim.Framework.Console;
18 19
19namespace OpenSim.world 20namespace OpenSim.world
20{ 21{
@@ -71,12 +72,12 @@ namespace OpenSim.world
71 m_scriptHandlers = new Dictionary<LLUUID, ScriptHandler>(); 72 m_scriptHandlers = new Dictionary<LLUUID, ScriptHandler>();
72 m_scripts = new Dictionary<string, ScriptFactory>(); 73 m_scripts = new Dictionary<string, ScriptFactory>();
73 74
74 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs - creating new entitities instance"); 75 MainConsole.Instance.Notice("World.cs - creating new entitities instance");
75 Entities = new Dictionary<libsecondlife.LLUUID, Entity>(); 76 Entities = new Dictionary<libsecondlife.LLUUID, Entity>();
76 Avatars = new Dictionary<LLUUID, Avatar>(); 77 Avatars = new Dictionary<LLUUID, Avatar>();
77 Prims = new Dictionary<LLUUID, Primitive>(); 78 Prims = new Dictionary<LLUUID, Primitive>();
78 79
79 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs - creating LandMap"); 80 MainConsole.Instance.Notice("World.cs - creating LandMap");
80 TerrainManager = new TerrainManager(new SecondLife()); 81 TerrainManager = new TerrainManager(new SecondLife());
81 Terrain = new TerrainEngine(); 82 Terrain = new TerrainEngine();
82 Avatar.SetupTemplate("avatar-texture.dat"); 83 Avatar.SetupTemplate("avatar-texture.dat");
@@ -90,7 +91,7 @@ namespace OpenSim.world
90 } 91 }
91 catch (Exception e) 92 catch (Exception e)
92 { 93 {
93 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.CRITICAL, "World.cs: Constructor failed with exception " + e.ToString()); 94 OpenSim.Framework.Console.MainConsole.Instance.Error("World.cs: Constructor failed with exception " + e.ToString());
94 } 95 }
95 } 96 }
96 #endregion 97 #endregion
@@ -110,7 +111,7 @@ namespace OpenSim.world
110 } 111 }
111 catch (Exception e) 112 catch (Exception e)
112 { 113 {
113 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: AddScript() - Failed with exception " + e.ToString()); 114 MainConsole.Instance.Warn("World.cs: AddScript() - Failed with exception " + e.ToString());
114 } 115 }
115 } 116 }
116 117
@@ -162,7 +163,7 @@ namespace OpenSim.world
162 } 163 }
163 catch (Exception e) 164 catch (Exception e)
164 { 165 {
165 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: AddScript() - Failed with exception " + e.ToString()); 166 MainConsole.Instance.Warn("World.cs: AddScript() - Failed with exception " + e.ToString());
166 } 167 }
167 } 168 }
168 169
@@ -216,7 +217,7 @@ namespace OpenSim.world
216 } 217 }
217 catch (Exception e) 218 catch (Exception e)
218 { 219 {
219 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: Update() - Failed with exception " + e.ToString()); 220 MainConsole.Instance.Warn("World.cs: Update() - Failed with exception " + e.ToString());
220 } 221 }
221 updateLock.ReleaseMutex(); 222 updateLock.ReleaseMutex();
222 } 223 }
@@ -229,15 +230,15 @@ namespace OpenSim.world
229 if (Terrain.tainted > 0) 230 if (Terrain.tainted > 0)
230 { 231 {
231 Terrain.tainted = 0; 232 Terrain.tainted = 0;
232 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs: Backup() - Terrain tainted, saving."); 233 MainConsole.Instance.Notice("World.cs: Backup() - Terrain tainted, saving.");
233 localStorage.SaveMap(Terrain.getHeights1D()); 234 localStorage.SaveMap(Terrain.getHeights1D());
234 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs: Backup() - Rebuilding world map image."); 235 MainConsole.Instance.Notice("World.cs: Backup() - Rebuilding world map image.");
235 Terrain.exportImage("map_" + m_regInfo.RegionName.ToLower() + ".png", "defaultstripe.png"); 236 Terrain.exportImage("map_" + m_regInfo.RegionName.ToLower() + ".png", "defaultstripe.png");
236 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs: Backup() - Terrain saved, informing Physics."); 237 MainConsole.Instance.Notice("World.cs: Backup() - Terrain saved, informing Physics.");
237 phyScene.SetTerrain(Terrain.getHeights1D()); 238 phyScene.SetTerrain(Terrain.getHeights1D());
238 239
239 // Needs optimising to just send patches which have changed. 240 // Needs optimising to just send patches which have changed.
240 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs: Backup() - Terrain changed, informing Clients."); 241 MainConsole.Instance.Notice("World.cs: Backup() - Terrain changed, informing Clients.");
241 foreach (ClientView client in m_clientThreads.Values) 242 foreach (ClientView client in m_clientThreads.Values)
242 { 243 {
243 this.SendLayerData(client); 244 this.SendLayerData(client);
@@ -245,7 +246,7 @@ namespace OpenSim.world
245 } 246 }
246 247
247 // Primitive backup routines -- should only do if there's been a change. 248 // Primitive backup routines -- should only do if there's been a change.
248 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs: Backup() - Backing up Primitives"); 249 MainConsole.Instance.Notice("World.cs: Backup() - Backing up Primitives");
249 foreach (libsecondlife.LLUUID UUID in Entities.Keys) 250 foreach (libsecondlife.LLUUID UUID in Entities.Keys)
250 { 251 {
251 Entities[UUID].BackUp(); 252 Entities[UUID].BackUp();
@@ -268,7 +269,7 @@ namespace OpenSim.world
268 catch (Exception e) 269 catch (Exception e)
269 { 270 {
270 // Backup failed 271 // Backup failed
271 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, "World.cs: Backup() - Backup Failed with exception " + e.ToString()); 272 OpenSim.Framework.Console.MainConsole.Instance.Error("World.cs: Backup() - Backup Failed with exception " + e.ToString());
272 return false; 273 return false;
273 } 274 }
274 } 275 }
@@ -314,7 +315,7 @@ namespace OpenSim.world
314 } 315 }
315 catch (Exception e) 316 catch (Exception e)
316 { 317 {
317 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: LoadStorageDLL() - Failed with exception " + e.ToString()); 318 MainConsole.Instance.Warn("World.cs: LoadStorageDLL() - Failed with exception " + e.ToString());
318 return false; 319 return false;
319 } 320 }
320 } 321 }
@@ -358,7 +359,7 @@ namespace OpenSim.world
358 } 359 }
359 catch (Exception e) 360 catch (Exception e)
360 { 361 {
361 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: RegenerateTerrain() - Failed with exception " + e.ToString()); 362 MainConsole.Instance.Warn("World.cs: RegenerateTerrain() - Failed with exception " + e.ToString());
362 } 363 }
363 } 364 }
364 365
@@ -389,7 +390,7 @@ namespace OpenSim.world
389 } 390 }
390 catch (Exception e) 391 catch (Exception e)
391 { 392 {
392 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: RegenerateTerrain() - Failed with exception " + e.ToString()); 393 MainConsole.Instance.Warn("World.cs: RegenerateTerrain() - Failed with exception " + e.ToString());
393 } 394 }
394 } 395 }
395 396
@@ -415,7 +416,7 @@ namespace OpenSim.world
415 } 416 }
416 catch (Exception e) 417 catch (Exception e)
417 { 418 {
418 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: RegenerateTerrain() - Failed with exception " + e.ToString()); 419 MainConsole.Instance.Warn("World.cs: RegenerateTerrain() - Failed with exception " + e.ToString());
419 } 420 }
420 } 421 }
421 422
@@ -461,7 +462,7 @@ namespace OpenSim.world
461 } 462 }
462 catch (Exception e) 463 catch (Exception e)
463 { 464 {
464 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: LoadWorldMap() - Failed with exception " + e.ToString()); 465 MainConsole.Instance.Warn("World.cs: LoadWorldMap() - Failed with exception " + e.ToString());
465 } 466 }
466 } 467 }
467 #endregion 468 #endregion
@@ -487,7 +488,7 @@ namespace OpenSim.world
487 } 488 }
488 catch (Exception e) 489 catch (Exception e)
489 { 490 {
490 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: GetInitialPrims() - Failed with exception " + e.ToString()); 491 MainConsole.Instance.Warn("World.cs: GetInitialPrims() - Failed with exception " + e.ToString());
491 } 492 }
492 } 493 }
493 494
@@ -498,12 +499,12 @@ namespace OpenSim.world
498 { 499 {
499 try 500 try
500 { 501 {
501 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs: LoadPrimsFromStorage() - Loading primitives"); 502 MainConsole.Instance.Notice("World.cs: LoadPrimsFromStorage() - Loading primitives");
502 this.localStorage.LoadPrimitives(this); 503 this.localStorage.LoadPrimitives(this);
503 } 504 }
504 catch (Exception e) 505 catch (Exception e)
505 { 506 {
506 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: LoadPrimsFromStorage() - Failed with exception " + e.ToString()); 507 MainConsole.Instance.Warn("World.cs: LoadPrimsFromStorage() - Failed with exception " + e.ToString());
507 } 508 }
508 } 509 }
509 510
@@ -519,14 +520,14 @@ namespace OpenSim.world
519 { 520 {
520 _primCount = prim.LocalID + 1; 521 _primCount = prim.LocalID + 1;
521 } 522 }
522 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs: PrimFromStorage() - Reloading prim (localId " + prim.LocalID + " ) from storage"); 523 MainConsole.Instance.Notice("World.cs: PrimFromStorage() - Reloading prim (localId " + prim.LocalID + " ) from storage");
523 Primitive nPrim = new Primitive(m_clientThreads, m_regionHandle, this); 524 Primitive nPrim = new Primitive(m_clientThreads, m_regionHandle, this);
524 nPrim.CreateFromStorage(prim); 525 nPrim.CreateFromStorage(prim);
525 this.Entities.Add(nPrim.uuid, nPrim); 526 this.Entities.Add(nPrim.uuid, nPrim);
526 } 527 }
527 catch (Exception e) 528 catch (Exception e)
528 { 529 {
529 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: PrimFromStorage() - Failed with exception " + e.ToString()); 530 MainConsole.Instance.Warn("World.cs: PrimFromStorage() - Failed with exception " + e.ToString());
530 } 531 }
531 } 532 }
532 533
@@ -539,7 +540,7 @@ namespace OpenSim.world
539 { 540 {
540 try 541 try
541 { 542 {
542 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs: AddNewPrim() - Creating new prim"); 543 MainConsole.Instance.Notice("World.cs: AddNewPrim() - Creating new prim");
543 Primitive prim = new Primitive(m_clientThreads, m_regionHandle, this); 544 Primitive prim = new Primitive(m_clientThreads, m_regionHandle, this);
544 prim.CreateFromPacket(addPacket, ownerID, this._primCount); 545 prim.CreateFromPacket(addPacket, ownerID, this._primCount);
545 PhysicsVector pVec = new PhysicsVector(prim.Pos.X, prim.Pos.Y, prim.Pos.Z); 546 PhysicsVector pVec = new PhysicsVector(prim.Pos.X, prim.Pos.Y, prim.Pos.Z);
@@ -557,7 +558,7 @@ namespace OpenSim.world
557 } 558 }
558 catch (Exception e) 559 catch (Exception e)
559 { 560 {
560 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: AddNewPrim() - Failed with exception " + e.ToString()); 561 MainConsole.Instance.Warn("World.cs: AddNewPrim() - Failed with exception " + e.ToString());
561 } 562 }
562 } 563 }
563 564
@@ -590,10 +591,10 @@ namespace OpenSim.world
590 Avatar newAvatar = null; 591 Avatar newAvatar = null;
591 try 592 try
592 { 593 {
593 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs:AddViewerAgent() - Creating new avatar for remote viewer agent"); 594 MainConsole.Instance.Notice("World.cs:AddViewerAgent() - Creating new avatar for remote viewer agent");
594 newAvatar = new Avatar(agentClient, this, m_regionName, m_clientThreads, m_regionHandle, true, 20); 595 newAvatar = new Avatar(agentClient, this, m_regionName, m_clientThreads, m_regionHandle, true, 20);
595 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs:AddViewerAgent() - Adding new avatar to world"); 596 MainConsole.Instance.Notice("World.cs:AddViewerAgent() - Adding new avatar to world");
596 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs:AddViewerAgent() - Starting RegionHandshake "); 597 MainConsole.Instance.Notice("World.cs:AddViewerAgent() - Starting RegionHandshake ");
597 newAvatar.SendRegionHandshake(this); 598 newAvatar.SendRegionHandshake(this);
598 //if (!agentClient.m_child) 599 //if (!agentClient.m_child)
599 //{ 600 //{
@@ -629,7 +630,7 @@ namespace OpenSim.world
629 } 630 }
630 catch (Exception e) 631 catch (Exception e)
631 { 632 {
632 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: AddViewerAgent() - Failed with exception " + e.ToString()); 633 MainConsole.Instance.Warn("World.cs: AddViewerAgent() - Failed with exception " + e.ToString());
633 } 634 }
634 return newAvatar; 635 return newAvatar;
635 } 636 }
@@ -655,7 +656,7 @@ namespace OpenSim.world
655 } 656 }
656 catch (Exception e) 657 catch (Exception e)
657 { 658 {
658 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: RemoveViewerAgent() - Failed with exception " + e.ToString()); 659 MainConsole.Instance.Warn("World.cs: RemoveViewerAgent() - Failed with exception " + e.ToString());
659 } 660 }
660 } 661 }
661 #endregion 662 #endregion
@@ -689,7 +690,7 @@ namespace OpenSim.world
689 } 690 }
690 catch (Exception e) 691 catch (Exception e)
691 { 692 {
692 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, "World.cs: Close() - Failed with exception " + e.ToString()); 693 OpenSim.Framework.Console.MainConsole.Instance.Error("World.cs: Close() - Failed with exception " + e.ToString());
693 } 694 }
694 } 695 }
695 #endregion 696 #endregion
diff --git a/OpenSim/OpenSim.RegionServer/world/WorldBase.cs b/OpenSim/OpenSim.RegionServer/world/WorldBase.cs
index f8fb49d..2d4b6bf 100644
--- a/OpenSim/OpenSim.RegionServer/world/WorldBase.cs
+++ b/OpenSim/OpenSim.RegionServer/world/WorldBase.cs
@@ -14,6 +14,7 @@ using OpenSim.Framework.Inventory;
14using OpenSim.Assets; 14using OpenSim.Assets;
15using OpenSim.RegionServer.world.scripting; 15using OpenSim.RegionServer.world.scripting;
16using OpenSim.Terrain; 16using OpenSim.Terrain;
17using OpenSim.Framework.Console;
17 18
18namespace OpenSim.world 19namespace OpenSim.world
19{ 20{
@@ -112,7 +113,7 @@ namespace OpenSim.world
112 } 113 }
113 catch (Exception e) 114 catch (Exception e)
114 { 115 {
115 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: SendLayerData() - Failed with exception " + e.ToString()); 116 MainConsole.Instance.Warn("World.cs: SendLayerData() - Failed with exception " + e.ToString());
116 } 117 }
117 } 118 }
118 119
@@ -138,7 +139,7 @@ namespace OpenSim.world
138 } 139 }
139 catch (Exception e) 140 catch (Exception e)
140 { 141 {
141 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: SendLayerData() - Failed with exception " + e.ToString()); 142 MainConsole.Instance.Warn("World.cs: SendLayerData() - Failed with exception " + e.ToString());
142 } 143 }
143 } 144 }
144 #endregion 145 #endregion
diff --git a/OpenSim/OpenSim.Storage/LocalStorageDb4o/Db4LocalStorage.cs b/OpenSim/OpenSim.Storage/LocalStorageDb4o/Db4LocalStorage.cs
index 087db96..ce8504d 100644
--- a/OpenSim/OpenSim.Storage/LocalStorageDb4o/Db4LocalStorage.cs
+++ b/OpenSim/OpenSim.Storage/LocalStorageDb4o/Db4LocalStorage.cs
@@ -33,6 +33,7 @@ using libsecondlife;
33using OpenSim.Framework.Interfaces; 33using OpenSim.Framework.Interfaces;
34using OpenSim.Framework.Types; 34using OpenSim.Framework.Types;
35using OpenSim.Framework.Terrain; 35using OpenSim.Framework.Terrain;
36using OpenSim.Framework.Console;
36 37
37 38
38namespace OpenSim.Storage.LocalStorageDb4o 39namespace OpenSim.Storage.LocalStorageDb4o
@@ -52,18 +53,18 @@ namespace OpenSim.Storage.LocalStorageDb4o
52 53
53 public void Initialise(string dfile) 54 public void Initialise(string dfile)
54 { 55 {
55 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,"Db4LocalStorage Opening " + dfile); 56 OpenSim.Framework.Console.MainConsole.Instance.Warn("Db4LocalStorage Opening " + dfile);
56 datastore = dfile; 57 datastore = dfile;
57 try 58 try
58 { 59 {
59 db = Db4oFactory.OpenFile(datastore); 60 db = Db4oFactory.OpenFile(datastore);
60 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Db4LocalStorage creation"); 61 OpenSim.Framework.Console.MainConsole.Instance.Verbose("Db4LocalStorage creation");
61 } 62 }
62 catch (Exception e) 63 catch (Exception e)
63 { 64 {
64 db.Close(); 65 db.Close();
65 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,"Db4LocalStorage :Constructor - Exception occured"); 66 OpenSim.Framework.Console.MainConsole.Instance.Warn("Db4LocalStorage :Constructor - Exception occured");
66 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,e.ToString()); 67 OpenSim.Framework.Console.MainConsole.Instance.Warn(e.ToString());
67 } 68 }
68 } 69 }
69 70
@@ -122,7 +123,7 @@ namespace OpenSim.Storage.LocalStorageDb4o
122 public void LoadPrimitives(ILocalStorageReceiver receiver) 123 public void LoadPrimitives(ILocalStorageReceiver receiver)
123 { 124 {
124 IObjectSet result = db.Get(typeof(PrimData)); 125 IObjectSet result = db.Get(typeof(PrimData));
125 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Db4LocalStorage.cs: LoadPrimitives() - number of prims in storages is "+result.Count); 126 OpenSim.Framework.Console.MainConsole.Instance.Verbose("Db4LocalStorage.cs: LoadPrimitives() - number of prims in storages is "+result.Count);
126 foreach (PrimData prim in result) { 127 foreach (PrimData prim in result) {
127 receiver.PrimFromStorage(prim); 128 receiver.PrimFromStorage(prim);
128 } 129 }
@@ -130,14 +131,14 @@ namespace OpenSim.Storage.LocalStorageDb4o
130 131
131 public float[] LoadWorld() 132 public float[] LoadWorld()
132 { 133 {
133 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"LoadWorld() - Loading world...."); 134 OpenSim.Framework.Console.MainConsole.Instance.Verbose("LoadWorld() - Loading world....");
134 //World blank = new World(); 135 //World blank = new World();
135 float[] heightmap = null; 136 float[] heightmap = null;
136 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"LoadWorld() - Looking for a heightmap in local DB"); 137 OpenSim.Framework.Console.MainConsole.Instance.Verbose("LoadWorld() - Looking for a heightmap in local DB");
137 IObjectSet world_result = db.Get(typeof(MapStorage)); 138 IObjectSet world_result = db.Get(typeof(MapStorage));
138 if (world_result.Count > 0) 139 if (world_result.Count > 0)
139 { 140 {
140 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"LoadWorld() - Found a heightmap in local database, loading"); 141 OpenSim.Framework.Console.MainConsole.Instance.Verbose("LoadWorld() - Found a heightmap in local database, loading");
141 MapStorage map = (MapStorage)world_result.Next(); 142 MapStorage map = (MapStorage)world_result.Next();
142 //blank.LandMap = map.Map; 143 //blank.LandMap = map.Map;
143 heightmap = map.Map; 144 heightmap = map.Map;
@@ -165,7 +166,7 @@ namespace OpenSim.Storage.LocalStorageDb4o
165 IObjectSet world_result = db.Get(typeof(MapStorage)); 166 IObjectSet world_result = db.Get(typeof(MapStorage));
166 if (world_result.Count > 0) 167 if (world_result.Count > 0)
167 { 168 {
168 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"SaveWorld() - updating saved copy of heightmap in local database"); 169 OpenSim.Framework.Console.MainConsole.Instance.Verbose("SaveWorld() - updating saved copy of heightmap in local database");
169 MapStorage map = (MapStorage)world_result.Next(); 170 MapStorage map = (MapStorage)world_result.Next();
170 db.Delete(map); 171 db.Delete(map);
171 } 172 }
@@ -177,31 +178,31 @@ namespace OpenSim.Storage.LocalStorageDb4o
177 178
178 public void SaveParcels(ParcelData[] parcel_data) 179 public void SaveParcels(ParcelData[] parcel_data)
179 { 180 {
180 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Parcel Backup: Saving Parcels..."); 181 MainConsole.Instance.Notice("Parcel Backup: Saving Parcels...");
181 IObjectSet result = db.Get(typeof(ParcelData)); 182 IObjectSet result = db.Get(typeof(ParcelData));
182 foreach (ParcelData parcel in result) 183 foreach (ParcelData parcel in result)
183 { 184 {
184 db.Delete(parcel); 185 db.Delete(parcel);
185 } 186 }
186 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Parcel Backup: Removing old entries complete. Adding new entries."); 187 MainConsole.Instance.Notice("Parcel Backup: Removing old entries complete. Adding new entries.");
187 int i; 188 int i;
188 for (i = 0; i < parcel_data.GetLength(0); i++) 189 for (i = 0; i < parcel_data.GetLength(0); i++)
189 { 190 {
190 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Adding : " + i); 191 MainConsole.Instance.Notice("Adding : " + i);
191 db.Set(parcel_data[i]); 192 db.Set(parcel_data[i]);
192 193
193 } 194 }
194 db.Commit(); 195 db.Commit();
195 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Parcel Backup: Parcel Save Complete"); 196 MainConsole.Instance.Notice("Parcel Backup: Parcel Save Complete");
196 } 197 }
197 198
198 public void LoadParcels(ILocalStorageParcelReceiver recv) 199 public void LoadParcels(ILocalStorageParcelReceiver recv)
199 { 200 {
200 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Parcel Backup: Loading Parcels..."); 201 MainConsole.Instance.Notice("Parcel Backup: Loading Parcels...");
201 IObjectSet result = db.Get(typeof(ParcelData)); 202 IObjectSet result = db.Get(typeof(ParcelData));
202 if (result.Count > 0) 203 if (result.Count > 0)
203 { 204 {
204 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Parcel Backup: Parcels exist in database."); 205 MainConsole.Instance.Notice("Parcel Backup: Parcels exist in database.");
205 foreach (ParcelData parcelData in result) 206 foreach (ParcelData parcelData in result)
206 { 207 {
207 recv.ParcelFromStorage(parcelData); 208 recv.ParcelFromStorage(parcelData);
@@ -209,10 +210,10 @@ namespace OpenSim.Storage.LocalStorageDb4o
209 } 210 }
210 else 211 else
211 { 212 {
212 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Parcel Backup: No parcels exist. Creating basic parcel."); 213 MainConsole.Instance.Notice("Parcel Backup: No parcels exist. Creating basic parcel.");
213 recv.NoParcelDataFromStorage(); 214 recv.NoParcelDataFromStorage();
214 } 215 }
215 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Parcel Backup: Parcels Restored"); 216 MainConsole.Instance.Notice("Parcel Backup: Parcels Restored");
216 } 217 }
217 public void ShutDown() 218 public void ShutDown()
218 { 219 {
diff --git a/OpenSim/OpenSim.Storage/LocalStorageSQLite/SQLiteLocalStorage.cs b/OpenSim/OpenSim.Storage/LocalStorageSQLite/SQLiteLocalStorage.cs
index 1f4c6be..02964d3 100644
--- a/OpenSim/OpenSim.Storage/LocalStorageSQLite/SQLiteLocalStorage.cs
+++ b/OpenSim/OpenSim.Storage/LocalStorageSQLite/SQLiteLocalStorage.cs
@@ -54,8 +54,8 @@ namespace OpenSim.Storage.LocalStorageSQLite
54 catch (Exception e) 54 catch (Exception e)
55 { 55 {
56 db.Close(); 56 db.Close();
57 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,"SQLiteLocalStorage :Constructor - Exception occured"); 57 OpenSim.Framework.Console.MainConsole.Instance.Warn("SQLiteLocalStorage :Constructor - Exception occured");
58 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,e.ToString()); 58 OpenSim.Framework.Console.MainConsole.Instance.Warn(e.ToString());
59 } 59 }
60 } 60 }
61 61
@@ -117,8 +117,8 @@ namespace OpenSim.Storage.LocalStorageSQLite
117 } 117 }
118 catch (Exception e) 118 catch (Exception e)
119 { 119 {
120 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,"SQLiteLocalStorage :StorePrim - Exception occured"); 120 OpenSim.Framework.Console.MainConsole.Instance.Warn("SQLiteLocalStorage :StorePrim - Exception occured");
121 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,e.ToString()); 121 OpenSim.Framework.Console.MainConsole.Instance.Warn(e.ToString());
122 } 122 }
123 123
124 cmd.Dispose(); 124 cmd.Dispose();
@@ -144,8 +144,8 @@ namespace OpenSim.Storage.LocalStorageSQLite
144 } 144 }
145 catch (Exception e) 145 catch (Exception e)
146 { 146 {
147 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,"SQLiteLocalStorage :RemovePrim - Exception occured"); 147 OpenSim.Framework.Console.MainConsole.Instance.Warn("SQLiteLocalStorage :RemovePrim - Exception occured");
148 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,e.ToString()); 148 OpenSim.Framework.Console.MainConsole.Instance.Warn(e.ToString());
149 } 149 }
150 150
151 cmd.Dispose(); 151 cmd.Dispose();
diff --git a/OpenSim/OpenSim/OpenSimMain.cs b/OpenSim/OpenSim/OpenSimMain.cs
index 7624d88..b462aac 100644
--- a/OpenSim/OpenSim/OpenSimMain.cs
+++ b/OpenSim/OpenSim/OpenSimMain.cs
@@ -89,7 +89,7 @@ namespace OpenSim
89 { 89 {
90 this.SetupFromConfigFile(this.localConfig); 90 this.SetupFromConfigFile(this.localConfig);
91 } 91 }
92 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Startup() - Loading configuration"); 92 m_console.Notice("Main.cs:Startup() - Loading configuration");
93 this.regionData.InitConfig(this.m_sandbox, this.localConfig); 93 this.regionData.InitConfig(this.m_sandbox, this.localConfig);
94 this.localConfig.Close();//for now we can close it as no other classes read from it , but this should change 94 this.localConfig.Close();//for now we can close it as no other classes read from it , but this should change
95 95
@@ -120,7 +120,7 @@ namespace OpenSim
120 } 120 }
121 catch (Exception e) 121 catch (Exception e)
122 { 122 {
123 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, e.Message + "\nSorry, could not setup local cache"); 123 m_console.Error(e.Message + "\nSorry, could not setup local cache");
124 Environment.Exit(1); 124 Environment.Exit(1);
125 } 125 }
126 126
@@ -143,7 +143,7 @@ namespace OpenSim
143 AssetCache.LoadDefaultTextureSet(); 143 AssetCache.LoadDefaultTextureSet();
144 } 144 }
145 145
146 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Startup() - Initialising HTTP server"); 146 m_console.Notice("Main.cs:Startup() - Initialising HTTP server");
147 147
148 this.SetupHttpListener(); 148 this.SetupHttpListener();
149 149
@@ -178,20 +178,20 @@ namespace OpenSim
178 adminWebFront.LoadMethods(httpServer); 178 adminWebFront.LoadMethods(httpServer);
179 179
180 //Start http server 180 //Start http server
181 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Startup() - Starting HTTP server"); 181 m_console.Notice("Main.cs:Startup() - Starting HTTP server");
182 httpServer.Start(); 182 httpServer.Start();
183 183
184 // Start UDP server 184 // Start UDP server
185 this.m_udpServer.ServerListener(); 185 this.m_udpServer.ServerListener();
186 186
187 //Setup Master Avatar 187 //Setup Master Avatar
188 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Startup() - Setting up Master Avatar"); 188 m_console.Notice("Main.cs:Startup() - Setting up Master Avatar");
189 if (this.m_sandbox) 189 if (this.m_sandbox)
190 { 190 {
191 OpenSim.Framework.User.UserProfile masterUser = adminLoginServer.LocalUserManager.GetProfileByName(this.regionData.MasterAvatarFirstName, this.regionData.MasterAvatarLastName); 191 OpenSim.Framework.User.UserProfile masterUser = adminLoginServer.LocalUserManager.GetProfileByName(this.regionData.MasterAvatarFirstName, this.regionData.MasterAvatarLastName);
192 if(masterUser == null) 192 if(masterUser == null)
193 { 193 {
194 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Startup() - Sandbox Mode; Master Avatar is a new user; creating account."); 194 m_console.Notice("Main.cs:Startup() - Sandbox Mode; Master Avatar is a new user; creating account.");
195 adminLoginServer.CreateUserAccount(this.regionData.MasterAvatarFirstName, this.regionData.MasterAvatarLastName, this.regionData.MasterAvatarSandboxPassword); 195 adminLoginServer.CreateUserAccount(this.regionData.MasterAvatarFirstName, this.regionData.MasterAvatarLastName, this.regionData.MasterAvatarSandboxPassword);
196 masterUser = adminLoginServer.LocalUserManager.GetProfileByName(this.regionData.MasterAvatarFirstName, this.regionData.MasterAvatarLastName); 196 masterUser = adminLoginServer.LocalUserManager.GetProfileByName(this.regionData.MasterAvatarFirstName, this.regionData.MasterAvatarLastName);
197 if(masterUser == null) //Still NULL?!!?! OMG FAIL! 197 if(masterUser == null) //Still NULL?!!?! OMG FAIL!
@@ -199,13 +199,13 @@ namespace OpenSim
199 throw new Exception("Failure to create master user account"); 199 throw new Exception("Failure to create master user account");
200 } 200 }
201 } 201 }
202 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Startup() - Master User UUID: " + masterUser.UUID.ToStringHyphenated()); 202 m_console.Notice("Main.cs:Startup() - Master User UUID: " + masterUser.UUID.ToStringHyphenated());
203 regionData.MasterAvatarAssignedUUID = masterUser.UUID; 203 regionData.MasterAvatarAssignedUUID = masterUser.UUID;
204 204
205 } 205 }
206 else 206 else
207 { 207 {
208 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Startup() - Grid Mode; Do not know how to get the user's master key yet!"); 208 m_console.Notice("Main.cs:Startup() - Grid Mode; Do not know how to get the user's master key yet!");
209 } 209 }
210 210
211 Console.WriteLine("Creating ParcelManager"); 211 Console.WriteLine("Creating ParcelManager");
@@ -225,7 +225,7 @@ namespace OpenSim
225 GridServers.AssetDll = "OpenSim.GridInterfaces.Local.dll"; 225 GridServers.AssetDll = "OpenSim.GridInterfaces.Local.dll";
226 GridServers.GridDll = "OpenSim.GridInterfaces.Local.dll"; 226 GridServers.GridDll = "OpenSim.GridInterfaces.Local.dll";
227 227
228 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Starting in Sandbox mode"); 228 m_console.Notice("Starting in Sandbox mode");
229 229
230 try 230 try
231 { 231 {
@@ -233,7 +233,7 @@ namespace OpenSim
233 } 233 }
234 catch (Exception e) 234 catch (Exception e)
235 { 235 {
236 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, e.Message + "\nSorry, could not setup the grid interface"); 236 m_console.Error(e.Message + "\nSorry, could not setup the grid interface");
237 Environment.Exit(1); 237 Environment.Exit(1);
238 } 238 }
239 } 239 }
@@ -250,7 +250,7 @@ namespace OpenSim
250 } 250 }
251 GridServers.GridDll = "OpenSim.GridInterfaces.Remote.dll"; 251 GridServers.GridDll = "OpenSim.GridInterfaces.Remote.dll";
252 252
253 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Starting in Grid mode"); 253 m_console.Notice("Starting in Grid mode");
254 254
255 try 255 try
256 { 256 {
@@ -258,15 +258,15 @@ namespace OpenSim
258 } 258 }
259 catch (Exception e) 259 catch (Exception e)
260 { 260 {
261 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, e.Message + "\nSorry, could not setup the grid interface"); 261 m_console.Error(e.Message + "\nSorry, could not setup the grid interface");
262 Environment.Exit(1); 262 Environment.Exit(1);
263 } 263 }
264 } 264 }
265 265
266 protected override void SetupLocalWorld() 266 protected override void SetupLocalWorld()
267 { 267 {
268 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.NORMAL, "Main.cs:Startup() - We are " + regionData.RegionName + " at " + regionData.RegionLocX.ToString() + "," + regionData.RegionLocY.ToString()); 268 m_console.Notice("Main.cs:Startup() - We are " + regionData.RegionName + " at " + regionData.RegionLocX.ToString() + "," + regionData.RegionLocY.ToString());
269 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Initialising world"); 269 m_console.Notice("Initialising world");
270 m_console.componentname = "Region " + regionData.RegionName; 270 m_console.componentname = "Region " + regionData.RegionName;
271 271
272 m_localWorld = new World(this.m_udpServer.PacketServer.ClientThreads, regionData, regionData.RegionHandle, regionData.RegionName); 272 m_localWorld = new World(this.m_udpServer.PacketServer.ClientThreads, regionData, regionData.RegionHandle, regionData.RegionName);
@@ -284,7 +284,7 @@ namespace OpenSim
284 LocalWorld.LoadStorageDLL("OpenSim.Storage.LocalStorageDb4o.dll"); //all these dll names shouldn't be hard coded. 284 LocalWorld.LoadStorageDLL("OpenSim.Storage.LocalStorageDb4o.dll"); //all these dll names shouldn't be hard coded.
285 LocalWorld.LoadWorldMap(); 285 LocalWorld.LoadWorldMap();
286 286
287 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Startup() - Starting up messaging system"); 287 m_console.Notice("Main.cs:Startup() - Starting up messaging system");
288 LocalWorld.PhysScene = this.physManager.GetPhysicsScene(this.m_physicsEngine); 288 LocalWorld.PhysScene = this.physManager.GetPhysicsScene(this.m_physicsEngine);
289 LocalWorld.PhysScene.SetTerrain(LocalWorld.Terrain.getHeights1D()); 289 LocalWorld.PhysScene.SetTerrain(LocalWorld.Terrain.getHeights1D());
290 LocalWorld.LoadPrimsFromStorage(); 290 LocalWorld.LoadPrimsFromStorage();
@@ -329,11 +329,11 @@ namespace OpenSim
329 { 329 {
330 if (GridServers.GridServer.RequestConnection(regionData.SimUUID, regionData.IPListenAddr, (uint)regionData.IPListenPort)) 330 if (GridServers.GridServer.RequestConnection(regionData.SimUUID, regionData.IPListenAddr, (uint)regionData.IPListenPort))
331 { 331 {
332 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Startup() - Success: Got a grid connection OK!"); 332 m_console.Notice("Main.cs:Startup() - Success: Got a grid connection OK!");
333 } 333 }
334 else 334 else
335 { 335 {
336 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.CRITICAL, "Main.cs:Startup() - FAILED: Unable to get connection to grid. Shutting down."); 336 m_console.Error("Main.cs:Startup() - FAILED: Unable to get connection to grid. Shutting down.");
337 Shutdown(); 337 Shutdown();
338 } 338 }
339 339
@@ -359,7 +359,7 @@ namespace OpenSim
359 } 359 }
360 catch (Exception e) 360 catch (Exception e)
361 { 361 {
362 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.CRITICAL, e.Message + "\nBAD ERROR! THIS SHOULD NOT HAPPEN! Bad GridData from the grid interface!!!! ZOMG!!!"); 362 m_console.Error(e.Message + "\nBAD ERROR! THIS SHOULD NOT HAPPEN! Bad GridData from the grid interface!!!! ZOMG!!!");
363 Environment.Exit(1); 363 Environment.Exit(1);
364 } 364 }
365 } 365 }
@@ -429,7 +429,7 @@ namespace OpenSim
429 switch (attri) 429 switch (attri)
430 { 430 {
431 default: 431 default:
432 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "Main.cs: SetupFromConfig() - Invalid value for PhysicsEngine attribute, terminating"); 432 m_console.Warn("Main.cs: SetupFromConfig() - Invalid value for PhysicsEngine attribute, terminating");
433 Environment.Exit(1); 433 Environment.Exit(1);
434 break; 434 break;
435 435
@@ -472,11 +472,11 @@ namespace OpenSim
472 /// </summary> 472 /// </summary>
473 public virtual void Shutdown() 473 public virtual void Shutdown()
474 { 474 {
475 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Shutdown() - Closing all threads"); 475 m_console.Notice("Main.cs:Shutdown() - Closing all threads");
476 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Shutdown() - Killing listener thread"); 476 m_console.Notice("Main.cs:Shutdown() - Killing listener thread");
477 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Shutdown() - Killing clients"); 477 m_console.Notice("Main.cs:Shutdown() - Killing clients");
478 // IMPLEMENT THIS 478 // IMPLEMENT THIS
479 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Shutdown() - Closing console and terminating"); 479 m_console.Notice("Main.cs:Shutdown() - Closing console and terminating");
480 LocalWorld.Close(); 480 LocalWorld.Close();
481 GridServers.Close(); 481 GridServers.Close();
482 m_console.Close(); 482 m_console.Close();
@@ -504,8 +504,8 @@ namespace OpenSim
504 switch (command) 504 switch (command)
505 { 505 {
506 case "help": 506 case "help":
507 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, "show users - show info about connected users"); 507 m_console.Error("show users - show info about connected users");
508 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, "shutdown - disconnect all clients and shutdown"); 508 m_console.Error("shutdown - disconnect all clients and shutdown");
509 break; 509 break;
510 510
511 case "show": 511 case "show":
@@ -516,7 +516,7 @@ namespace OpenSim
516 string result = ""; 516 string result = "";
517 if (!LocalWorld.Terrain.RunTerrainCmd(cmdparams, ref result)) 517 if (!LocalWorld.Terrain.RunTerrainCmd(cmdparams, ref result))
518 { 518 {
519 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, result); 519 m_console.Error(result);
520 } 520 }
521 break; 521 break;
522 522
@@ -525,7 +525,7 @@ namespace OpenSim
525 break; 525 break;
526 526
527 default: 527 default:
528 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, "Unknown command"); 528 m_console.Error("Unknown command");
529 break; 529 break;
530 } 530 }
531 } 531 }
@@ -539,18 +539,18 @@ namespace OpenSim
539 switch (ShowWhat) 539 switch (ShowWhat)
540 { 540 {
541 case "uptime": 541 case "uptime":
542 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, "OpenSim has been running since " + startuptime.ToString()); 542 m_console.Error("OpenSim has been running since " + startuptime.ToString());
543 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, "That is " + (DateTime.Now - startuptime).ToString()); 543 m_console.Error("That is " + (DateTime.Now - startuptime).ToString());
544 break; 544 break;
545 case "users": 545 case "users":
546 OpenSim.world.Avatar TempAv; 546 OpenSim.world.Avatar TempAv;
547 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")); 547 m_console.Error(String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16}{5,-16}", "Firstname", "Lastname", "Agent ID", "Session ID", "Circuit", "IP"));
548 foreach (libsecondlife.LLUUID UUID in LocalWorld.Entities.Keys) 548 foreach (libsecondlife.LLUUID UUID in LocalWorld.Entities.Keys)
549 { 549 {
550 if (LocalWorld.Entities[UUID].ToString() == "OpenSim.world.Avatar") 550 if (LocalWorld.Entities[UUID].ToString() == "OpenSim.world.Avatar")
551 { 551 {
552 TempAv = (OpenSim.world.Avatar)LocalWorld.Entities[UUID]; 552 TempAv = (OpenSim.world.Avatar)LocalWorld.Entities[UUID];
553 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())); 553 m_console.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()));
554 } 554 }
555 } 555 }
556 break; 556 break;
generated by cgit v1.1 at 2024-11-06 01:42:22 +0000