aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs4
-rw-r--r--OpenSim/Region/ClientStack/ClientView.cs8
-rw-r--r--OpenSim/Region/ClientStack/RegionApplicationBase.cs2
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1GridServices.cs2
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1UserServices.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/ChatModule.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/InnerScene.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs8
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs2
-rw-r--r--OpenSim/Region/ExtensionsScriptModule/Script.cs2
-rw-r--r--OpenSim/Region/ExtensionsScriptModule/ScriptManager.cs6
-rw-r--r--OpenSim/Region/Physics/Manager/PhysicsScene.cs8
-rw-r--r--OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs4
13 files changed, 26 insertions, 26 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 50018ac..2e089b8 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -782,12 +782,12 @@ namespace OpenSim
782 782
783 if (m_sceneManager.CurrentScene == null) 783 if (m_sceneManager.CurrentScene == null)
784 { 784 {
785 MainLog.Instance.Verbose( 785 MainLog.Instance.Verbose("CONSOLE",
786 "Currently at Root level. To change region please use 'change-region <regioname>'"); 786 "Currently at Root level. To change region please use 'change-region <regioname>'");
787 } 787 }
788 else 788 else
789 { 789 {
790 MainLog.Instance.Verbose("Current Region: " + m_sceneManager.CurrentScene.RegionInfo.RegionName + 790 MainLog.Instance.Verbose("CONSOLE", "Current Region: " + m_sceneManager.CurrentScene.RegionInfo.RegionName +
791 ". To change region please use 'change-region <regioname>'"); 791 ". To change region please use 'change-region <regioname>'");
792 } 792 }
793 793
diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs
index 1c16a95..56ab5d6 100644
--- a/OpenSim/Region/ClientStack/ClientView.cs
+++ b/OpenSim/Region/ClientStack/ClientView.cs
@@ -453,11 +453,11 @@ namespace OpenSim.Region.ClientStack
453 if (bytesSent > throttleOutboundMax) 453 if (bytesSent > throttleOutboundMax)
454 { 454 {
455 PacketQueue.Enqueue(nextPacket); 455 PacketQueue.Enqueue(nextPacket);
456 MainLog.Instance.Verbose("Client over throttle limit, requeuing packet"); 456 MainLog.Instance.Verbose("THROTTLE", "Client over throttle limit, requeuing packet");
457 457
458 if (queuedLast) 458 if (queuedLast)
459 { 459 {
460 MainLog.Instance.Verbose("No more sendable packets, need to sleep now"); 460 MainLog.Instance.Verbose("THROTTLE", "No more sendable packets, need to sleep now");
461 Thread.Sleep(100); // Wait a little while if this was the last packet we saw 461 Thread.Sleep(100); // Wait a little while if this was the last packet we saw
462 } 462 }
463 463
@@ -2485,7 +2485,7 @@ namespace OpenSim.Region.ClientStack
2485 { 2485 {
2486 if ((now - packet.TickCount > RESEND_TIMEOUT) && (!packet.Header.Resent)) 2486 if ((now - packet.TickCount > RESEND_TIMEOUT) && (!packet.Header.Resent))
2487 { 2487 {
2488 MainLog.Instance.Verbose("Resending " + packet.Type.ToString() + " packet, " + 2488 MainLog.Instance.Verbose("NETWORK", "Resending " + packet.Type.ToString() + " packet, " +
2489 (now - packet.TickCount) + "ms have passed"); 2489 (now - packet.TickCount) + "ms have passed");
2490 2490
2491 packet.Header.Resent = true; 2491 packet.Header.Resent = true;
@@ -2504,7 +2504,7 @@ namespace OpenSim.Region.ClientStack
2504 if (PendingAcks.Count > 250) 2504 if (PendingAcks.Count > 250)
2505 { 2505 {
2506 // FIXME: Handle the odd case where we have too many pending ACKs queued up 2506 // FIXME: Handle the odd case where we have too many pending ACKs queued up
2507 MainLog.Instance.Verbose("Too many ACKs queued up!"); 2507 MainLog.Instance.Verbose("NETWORK", "Too many ACKs queued up!");
2508 return; 2508 return;
2509 } 2509 }
2510 2510
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
index 4c0c02d..5b43fec 100644
--- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs
+++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
@@ -79,7 +79,7 @@ namespace OpenSim.Region.ClientStack
79 79
80 m_httpServer = new BaseHttpServer(m_httpServerPort); 80 m_httpServer = new BaseHttpServer(m_httpServerPort);
81 81
82 m_log.Verbose("Starting HTTP server"); 82 m_log.Status("REGION", "Starting HTTP server");
83 m_httpServer.Start(); 83 m_httpServer.Start();
84 } 84 }
85 85
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index f4e858b..b11a91f 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -433,7 +433,7 @@ namespace OpenSim.Region.Communications.OGS1
433 433
434 m_localBackend.TriggerExpectUser(regionHandle, agentData); 434 m_localBackend.TriggerExpectUser(regionHandle, agentData);
435 435
436 MainLog.Instance.Verbose("ExpectUser() - Welcoming new user..."); 436 MainLog.Instance.Verbose("GRID", "Welcoming new user...");
437 437
438 return new XmlRpcResponse(); 438 return new XmlRpcResponse();
439 } 439 }
diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
index b841154..475066e 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
@@ -50,7 +50,7 @@ namespace OpenSim.Region.Communications.OGS1
50 { 50 {
51 if (data.Contains("error_type")) 51 if (data.Contains("error_type"))
52 { 52 {
53 Console.WriteLine("Error sent by user server when trying to get user profile: (" + data["error_type"] + 53 OpenSim.Framework.Console.MainLog.Instance.Warn("GRID", "Error sent by user server when trying to get user profile: (" + data["error_type"] +
54 "): " + data["error_desc"]); 54 "): " + data["error_desc"]);
55 return null; 55 return null;
56 } 56 }
diff --git a/OpenSim/Region/Environment/Modules/ChatModule.cs b/OpenSim/Region/Environment/Modules/ChatModule.cs
index 82cec82..924972b 100644
--- a/OpenSim/Region/Environment/Modules/ChatModule.cs
+++ b/OpenSim/Region/Environment/Modules/ChatModule.cs
@@ -306,7 +306,7 @@ namespace OpenSim.Region.Environment.Modules
306 } 306 }
307 catch (Exception) 307 catch (Exception)
308 { 308 {
309 Console.WriteLine("No IRC config information, skipping IRC bridge configuration"); 309 OpenSim.Framework.Console.MainLog.Instance.Verbose("CHAT", "No IRC config information, skipping IRC bridge configuration");
310 } 310 }
311 m_log = MainLog.Instance; 311 m_log = MainLog.Instance;
312 } 312 }
diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs
index cceaa14..290629c 100644
--- a/OpenSim/Region/Environment/Scenes/InnerScene.cs
+++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs
@@ -700,7 +700,7 @@ namespace OpenSim.Region.Environment.Scenes
700 } 700 }
701 else 701 else
702 { 702 {
703 OpenSim.Framework.Console.MainLog.Instance.Verbose( 703 OpenSim.Framework.Console.MainLog.Instance.Verbose("SCENE",
704 "DelinkObjects(): Could not find a root prim out of {0} as given to a delink request!", 704 "DelinkObjects(): Could not find a root prim out of {0} as given to a delink request!",
705 primIds); 705 primIds);
706 } 706 }
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index e671038..f9cace2 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -239,12 +239,12 @@ namespace OpenSim.Region.Environment.Scenes
239 239
240 RegisterDefaultSceneEvents(); 240 RegisterDefaultSceneEvents();
241 241
242 MainLog.Instance.Verbose("Creating new entitities instance"); 242 MainLog.Instance.Verbose("SCENE", "Creating new entitities instance");
243 Entities = new Dictionary<LLUUID, EntityBase>(); 243 Entities = new Dictionary<LLUUID, EntityBase>();
244 m_scenePresences = new Dictionary<LLUUID, ScenePresence>(); 244 m_scenePresences = new Dictionary<LLUUID, ScenePresence>();
245 m_sceneObjects = new Dictionary<LLUUID, SceneObjectGroup>(); 245 m_sceneObjects = new Dictionary<LLUUID, SceneObjectGroup>();
246 246
247 MainLog.Instance.Verbose("Creating LandMap"); 247 MainLog.Instance.Verbose("SCENE", "Creating LandMap");
248 Terrain = new TerrainEngine((int)RegionInfo.RegionLocX, (int)RegionInfo.RegionLocY); 248 Terrain = new TerrainEngine((int)RegionInfo.RegionLocX, (int)RegionInfo.RegionLocY);
249 249
250 ScenePresence.LoadAnims(); 250 ScenePresence.LoadAnims();
@@ -727,7 +727,7 @@ namespace OpenSim.Region.Environment.Scenes
727 /// </summary> 727 /// </summary>
728 public virtual void LoadPrimsFromStorage(bool m_permissions) 728 public virtual void LoadPrimsFromStorage(bool m_permissions)
729 { 729 {
730 MainLog.Instance.Verbose("Loading objects from datastore"); 730 MainLog.Instance.Verbose("SCENE", "Loading objects from datastore");
731 List<SceneObjectGroup> PrimsFromDB = m_storageManager.DataStore.LoadObjects(m_regInfo.RegionID); 731 List<SceneObjectGroup> PrimsFromDB = m_storageManager.DataStore.LoadObjects(m_regInfo.RegionID);
732 foreach (SceneObjectGroup prim in PrimsFromDB) 732 foreach (SceneObjectGroup prim in PrimsFromDB)
733 { 733 {
@@ -759,7 +759,7 @@ namespace OpenSim.Region.Environment.Scenes
759 rootPart.RotationOffset.Y, rootPart.RotationOffset.Z), UsePhysics); 759 rootPart.RotationOffset.Y, rootPart.RotationOffset.Z), UsePhysics);
760 rootPart.DoPhysicsPropertyUpdate(UsePhysics, true); 760 rootPart.DoPhysicsPropertyUpdate(UsePhysics, true);
761 } 761 }
762 MainLog.Instance.Verbose("Loaded " + PrimsFromDB.Count.ToString() + " SceneObject(s)"); 762 MainLog.Instance.Verbose("SCENE", "Loaded " + PrimsFromDB.Count.ToString() + " SceneObject(s)");
763 } 763 }
764 764
765 765
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index 193677e..eb8b767 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -943,7 +943,7 @@ namespace OpenSim.Region.Environment.Scenes
943 } 943 }
944 else 944 else
945 { 945 {
946 OpenSim.Framework.Console.MainLog.Instance.Verbose( 946 OpenSim.Framework.Console.MainLog.Instance.Verbose("SCENE",
947 "DelinkFromGroup(): Child prim local id {0} not found in object with root prim id {1}", 947 "DelinkFromGroup(): Child prim local id {0} not found in object with root prim id {1}",
948 partID, LocalId); 948 partID, LocalId);
949 } 949 }
diff --git a/OpenSim/Region/ExtensionsScriptModule/Script.cs b/OpenSim/Region/ExtensionsScriptModule/Script.cs
index 5f85799..350ca2d 100644
--- a/OpenSim/Region/ExtensionsScriptModule/Script.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/Script.cs
@@ -53,7 +53,7 @@ namespace OpenSim.Region.ExtensionsScriptModule
53 53
54 private void events_OnNewPresence(ScenePresence presence) 54 private void events_OnNewPresence(ScenePresence presence)
55 { 55 {
56 script.logger.Verbose("Hello " + presence.Firstname.ToString() + "!"); 56 script.logger.Verbose("TESTSCRIPT", "Hello " + presence.Firstname.ToString() + "!");
57 } 57 }
58 58
59 private void events_OnFrame() 59 private void events_OnFrame()
diff --git a/OpenSim/Region/ExtensionsScriptModule/ScriptManager.cs b/OpenSim/Region/ExtensionsScriptModule/ScriptManager.cs
index 8cd94c3..dd70ad5 100644
--- a/OpenSim/Region/ExtensionsScriptModule/ScriptManager.cs
+++ b/OpenSim/Region/ExtensionsScriptModule/ScriptManager.cs
@@ -48,12 +48,12 @@ namespace OpenSim.Region.ExtensionsScriptModule
48 { 48 {
49 ScriptInfo scriptInfo = new ScriptInfo(m_scene); 49 ScriptInfo scriptInfo = new ScriptInfo(m_scene);
50 // Since each script could potentially corrupt their access with a stray assignment, making a new one for each script. 50 // Since each script could potentially corrupt their access with a stray assignment, making a new one for each script.
51 MainLog.Instance.Verbose("Loading " + script.Key); 51 MainLog.Instance.Verbose("SCRIPT", "Loading " + script.Key);
52 script.Value.Initialise(scriptInfo); 52 script.Value.Initialise(scriptInfo);
53 scripts.Add(script.Value); 53 scripts.Add(script.Value);
54 } 54 }
55 55
56 MainLog.Instance.Verbose(string.Format("Finished loading {0} script(s)", compiledscripts.Count)); 56 MainLog.Instance.Verbose("SCRIPT", string.Format("Finished loading {0} script(s)", compiledscripts.Count));
57 } 57 }
58 58
59 public ScriptManager() 59 public ScriptManager()
@@ -125,7 +125,7 @@ namespace OpenSim.Region.ExtensionsScriptModule
125 125
126 public bool AddPreCompiledScript(IScript script) 126 public bool AddPreCompiledScript(IScript script)
127 { 127 {
128 MainLog.Instance.Verbose("Loading script " + script.Name); 128 MainLog.Instance.Verbose("SCRIPT", "Loading script " + script.Name);
129 ScriptInfo scriptInfo = new ScriptInfo(m_scene); 129 ScriptInfo scriptInfo = new ScriptInfo(m_scene);
130 // Since each script could potentially corrupt their access with a stray assignment, making a new one for each script. 130 // Since each script could potentially corrupt their access with a stray assignment, making a new one for each script.
131 script.Initialise(scriptInfo); 131 script.Initialise(scriptInfo);
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
index 635b208..56a1842 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
@@ -92,7 +92,7 @@ namespace OpenSim.Region.Physics.Manager
92 92
93 public override PhysicsActor AddAvatar(string avName, PhysicsVector position) 93 public override PhysicsActor AddAvatar(string avName, PhysicsVector position)
94 { 94 {
95 MainLog.Instance.Verbose("NullPhysicsScene : AddAvatar({0})", position); 95 MainLog.Instance.Verbose("PHYSICS", "NullPhysicsScene : AddAvatar({0})", position);
96 return PhysicsActor.Null; 96 return PhysicsActor.Null;
97 } 97 }
98 98
@@ -119,7 +119,7 @@ namespace OpenSim.Region.Physics.Manager
119 public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, PhysicsVector position, 119 public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, PhysicsVector position,
120 PhysicsVector size, Quaternion rotation, bool isPhysical) 120 PhysicsVector size, Quaternion rotation, bool isPhysical)
121 { 121 {
122 MainLog.Instance.Verbose("NullPhysicsScene : AddPrim({0},{1})", position, size); 122 MainLog.Instance.Verbose("PHYSICS", "NullPhysicsScene : AddPrim({0},{1})", position, size);
123 return PhysicsActor.Null; 123 return PhysicsActor.Null;
124 } 124 }
125 public override void AddPhysicsActorTaint(PhysicsActor prim) 125 public override void AddPhysicsActorTaint(PhysicsActor prim)
@@ -135,12 +135,12 @@ namespace OpenSim.Region.Physics.Manager
135 135
136 public override void GetResults() 136 public override void GetResults()
137 { 137 {
138 MainLog.Instance.Verbose("NullPhysicsScene : GetResults()"); 138 MainLog.Instance.Verbose("PHYSICS", "NullPhysicsScene : GetResults()");
139 } 139 }
140 140
141 public override void SetTerrain(float[] heightMap) 141 public override void SetTerrain(float[] heightMap)
142 { 142 {
143 MainLog.Instance.Verbose("NullPhysicsScene : SetTerrain({0} items)", heightMap.Length); 143 MainLog.Instance.Verbose("PHYSICS", "NullPhysicsScene : SetTerrain({0} items)", heightMap.Length);
144 } 144 }
145 145
146 public override void DeleteTerrain() 146 public override void DeleteTerrain()
diff --git a/OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs b/OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs
index 83d3d82..5285b82 100644
--- a/OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs
+++ b/OpenSim/Region/Storage/OpenSim.DataStore.MonoSqlite/MonoSqliteDataStore.cs
@@ -248,10 +248,10 @@ namespace OpenSim.DataStore.MonoSqlite
248 catch (Exception e) 248 catch (Exception e)
249 { 249 {
250 MainLog.Instance.Error("DATASTORE", "Failed create prim object, exception and data follows"); 250 MainLog.Instance.Error("DATASTORE", "Failed create prim object, exception and data follows");
251 MainLog.Instance.Verbose(e.ToString()); 251 MainLog.Instance.Verbose("DATASTORE", e.ToString());
252 foreach (DataColumn col in prims.Columns) 252 foreach (DataColumn col in prims.Columns)
253 { 253 {
254 MainLog.Instance.Verbose("Col: " + col.ColumnName + " => " + primRow[col]); 254 MainLog.Instance.Verbose("DATASTORE", "Col: " + col.ColumnName + " => " + primRow[col]);
255 } 255 }
256 } 256 }
257 } 257 }