diff --git a/OpenSim/Framework/ConfigurationMember.cs b/OpenSim/Framework/ConfigurationMember.cs index 15008ae595..271c02c272 100644 --- a/OpenSim/Framework/ConfigurationMember.cs +++ b/OpenSim/Framework/ConfigurationMember.cs @@ -147,19 +147,19 @@ namespace OpenSim.Framework return; } - MainLog.Instance.Verbose("Calling Configuration Load Function..."); + MainLog.Instance.Verbose("CONFIG", "Calling Configuration Load Function..."); this.loadFunction(); if(configurationOptions.Count <= 0) { - MainLog.Instance.Error("No configuration options were specified for '" + this.configurationOptions + "'. Refusing to continue configuration."); + MainLog.Instance.Error("CONFIG", "No configuration options were specified for '" + this.configurationOptions + "'. Refusing to continue configuration."); return; } bool useFile = true; if (configurationPlugin == null) { - MainLog.Instance.Error("Configuration Plugin NOT LOADED!"); + MainLog.Instance.Error("CONFIG", "Configuration Plugin NOT LOADED!"); return; } diff --git a/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs b/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs index 744d1909d6..41450dcbf1 100644 --- a/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs +++ b/OpenSim/Framework/Data.MySQL/MySQLDataStore.cs @@ -183,10 +183,10 @@ namespace OpenSim.Framework.Data.MySQL catch (Exception e) { MainLog.Instance.Error("DATASTORE", "Failed create prim object, exception and data follows"); - MainLog.Instance.Verbose(e.ToString()); + MainLog.Instance.Verbose("DATASTORE", e.ToString()); foreach (DataColumn col in prims.Columns) { - MainLog.Instance.Verbose("Col: " + col.ColumnName + " => " + primRow[col]); + MainLog.Instance.Verbose("DATASTORE", "Col: " + col.ColumnName + " => " + primRow[col]); } } } diff --git a/OpenSim/Framework/Data.MySQL/MySQLManager.cs b/OpenSim/Framework/Data.MySQL/MySQLManager.cs index 3c31d37b05..178a4cdf7e 100644 --- a/OpenSim/Framework/Data.MySQL/MySQLManager.cs +++ b/OpenSim/Framework/Data.MySQL/MySQLManager.cs @@ -71,7 +71,7 @@ namespace OpenSim.Framework.Data.MySQL dbcon.Open(); - MainLog.Instance.Verbose("MySQL connection established"); + MainLog.Instance.Verbose("MYSQL", "Connection established"); } catch (Exception e) { diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs index 691ed575c1..404fbdcc80 100644 --- a/OpenSim/Grid/GridServer/GridManager.cs +++ b/OpenSim/Grid/GridServer/GridManager.cs @@ -52,10 +52,10 @@ namespace OpenSim.Grid.GridServer /// The filename to the grid server plugin DLL public void AddPlugin(string FileName) { - MainLog.Instance.Verbose("Storage: Attempting to load " + FileName); + MainLog.Instance.Verbose("DATA", "Attempting to load " + FileName); Assembly pluginAssembly = Assembly.LoadFrom(FileName); - MainLog.Instance.Verbose("Storage: Found " + pluginAssembly.GetTypes().Length + " interfaces."); + MainLog.Instance.Verbose("DATA", "Found " + pluginAssembly.GetTypes().Length + " interfaces."); foreach (Type pluginType in pluginAssembly.GetTypes()) { if (!pluginType.IsAbstract) @@ -69,7 +69,7 @@ namespace OpenSim.Grid.GridServer (IGridData) Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); plug.Initialise(); _plugins.Add(plug.getName(), plug); - MainLog.Instance.Verbose("Storage: Added IGridData Interface"); + MainLog.Instance.Verbose("DATA", "Added IGridData Interface"); } typeInterface = null; @@ -83,7 +83,7 @@ namespace OpenSim.Grid.GridServer (ILogData) Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); plug.Initialise(); _logplugins.Add(plug.getName(), plug); - MainLog.Instance.Verbose("Storage: Added ILogData Interface"); + MainLog.Instance.Verbose("DATA", "Added ILogData Interface"); } typeInterface = null; @@ -469,7 +469,7 @@ namespace OpenSim.Grid.GridServer { ymax = (Int32) requestData["ymax"]; } - MainLog.Instance.Verbose("World map request for range (" + xmin + "," + ymin + ")..(" + xmax + "," + ymax + ")"); + MainLog.Instance.Verbose("MAP", "World map request for range (" + xmin + "," + ymin + ")..(" + xmax + "," + ymax + ")"); XmlRpcResponse response = new XmlRpcResponse(); Hashtable responseData = new Hashtable(); @@ -507,7 +507,7 @@ namespace OpenSim.Grid.GridServer simProfileList.Add(simProfileBlock); } - MainLog.Instance.Verbose("World map request processed, returned " + simProfileList.Count.ToString() + + MainLog.Instance.Verbose("MAP", "World map request processed, returned " + simProfileList.Count.ToString() + " region(s) in range via FastMode"); } else @@ -542,7 +542,7 @@ namespace OpenSim.Grid.GridServer } } } - MainLog.Instance.Verbose("World map request processed, returned " + simProfileList.Count.ToString() + + MainLog.Instance.Verbose("MAP", "World map request processed, returned " + simProfileList.Count.ToString() + " region(s) in range via Standard Mode"); } @@ -708,7 +708,7 @@ namespace OpenSim.Grid.GridServer try { - MainLog.Instance.Verbose("Updating / adding via " + _plugins.Count + " storage provider(s) registered."); + MainLog.Instance.Verbose("DATA", "Updating / adding via " + _plugins.Count + " storage provider(s) registered."); foreach (KeyValuePair kvp in _plugins) { try @@ -734,7 +734,7 @@ namespace OpenSim.Grid.GridServer } catch (Exception e) { - MainLog.Instance.Verbose("getRegionPlugin Handle " + kvp.Key + " unable to add new sim: " + + MainLog.Instance.Warn("GRID", "getRegionPlugin Handle " + kvp.Key + " unable to add new sim: " + e.ToString()); } } diff --git a/OpenSim/Grid/GridServer/Main.cs b/OpenSim/Grid/GridServer/Main.cs index 9b1892deda..b793cf9a0f 100644 --- a/OpenSim/Grid/GridServer/Main.cs +++ b/OpenSim/Grid/GridServer/Main.cs @@ -106,12 +106,12 @@ namespace OpenSim.Grid.GridServer //Yeah srsly, that's it. if (setuponly) Environment.Exit(0); - m_console.Verbose("Main.cs:Startup() - Connecting to Storage Server"); + m_console.Verbose("GRID", "Connecting to Storage Server"); m_gridManager = new GridManager(); m_gridManager.AddPlugin(Cfg.DatabaseProvider); // Made of win m_gridManager.config = Cfg; - m_console.Verbose("Main.cs:Startup() - Starting HTTP process"); + m_console.Verbose("GRID", "Starting HTTP process"); BaseHttpServer httpServer = new BaseHttpServer((int) Cfg.HttpPort); //GridManagementAgent GridManagerAgent = new GridManagementAgent(httpServer, "gridserver", Cfg.SimSendKey, Cfg.SimRecvKey, managercallback); @@ -132,7 +132,7 @@ namespace OpenSim.Grid.GridServer httpServer.Start(); - m_console.Verbose("Main.cs:Startup() - Starting sim status checker"); + m_console.Verbose("GRID", "Starting sim status checker"); Timer simCheckTimer = new Timer(3600000*3); // 3 Hours between updates. simCheckTimer.Elapsed += new ElapsedEventHandler(CheckSims); diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs index c03c4f058e..c834690992 100644 --- a/OpenSim/Grid/UserServer/Main.cs +++ b/OpenSim/Grid/UserServer/Main.cs @@ -84,14 +84,14 @@ namespace OpenSim.Grid.UserServer { Cfg = new UserConfig("USER SERVER", (Path.Combine(Util.configDir(), "UserServer_Config.xml"))); - MainLog.Instance.Verbose("Main.cs:Startup() - Establishing data connection"); + MainLog.Instance.Verbose("REGION", "Establishing data connection"); m_userManager = new UserManager(); m_userManager._config = Cfg; m_userManager.AddPlugin(Cfg.DatabaseProvider); m_loginService = new UserLoginService(m_userManager, Cfg, Cfg.DefaultStartupMsg); - MainLog.Instance.Verbose("Main.cs:Startup() - Starting HTTP process"); + MainLog.Instance.Verbose("REGION", "Starting HTTP process"); BaseHttpServer httpServer = new BaseHttpServer((int) Cfg.HttpPort); httpServer.AddXmlRPCHandler("login_to_simulator", m_loginService.XmlRpcLoginMethod); diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs index ef4b82de97..4d1328e7be 100644 --- a/OpenSim/Grid/UserServer/UserLoginService.cs +++ b/OpenSim/Grid/UserServer/UserLoginService.cs @@ -78,7 +78,7 @@ namespace OpenSim.Grid.UserServer theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "]}"; // Destination - MainLog.Instance.Verbose("CUSTOMISERESPONSE: Region X: " + SimInfo.regionLocX + "; Region Y: " + + MainLog.Instance.Verbose("LOGIN", "CUSTOMISERESPONSE: Region X: " + SimInfo.regionLocX + "; Region Y: " + SimInfo.regionLocY); response.SimAddress = Util.GetHostFromDNS(SimInfo.serverIP).ToString(); response.SimPort = (Int32)SimInfo.serverPort; @@ -90,7 +90,7 @@ namespace OpenSim.Grid.UserServer response.SeedCapability = SimInfo.httpServerURI + "CAPS/" + capsPath + "0000/"; // Notify the target of an incoming user - MainLog.Instance.Verbose("Notifying " + SimInfo.regionName + " (" + SimInfo.serverURI + ")"); + MainLog.Instance.Verbose("LOGIN", "Notifying " + SimInfo.regionName + " (" + SimInfo.serverURI + ")"); // Prepare notification Hashtable SimParams = new Hashtable(); @@ -112,7 +112,7 @@ namespace OpenSim.Grid.UserServer theUser.currentAgent.currentRegion = SimInfo.UUID; theUser.currentAgent.currentHandle = SimInfo.regionHandle; - MainLog.Instance.Verbose("Informing region --> " + SimInfo.httpServerURI); + MainLog.Instance.Verbose("LOGIN", "Informing region at " + SimInfo.httpServerURI); // Send XmlRpcRequest GridReq = new XmlRpcRequest("expect_user", SendParams); @@ -146,7 +146,7 @@ namespace OpenSim.Grid.UserServer theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "]}"; // Destination - MainLog.Instance.Verbose("CUSTOMISERESPONSE: Region X: " + SimInfo.regionLocX + "; Region Y: " + + MainLog.Instance.Verbose("LOGIN", "CUSTOMISERESPONSE: Region X: " + SimInfo.regionLocX + "; Region Y: " + SimInfo.regionLocY); response.SimAddress = Util.GetHostFromDNS(SimInfo.serverIP).ToString(); response.SimPort = (Int32)SimInfo.serverPort; @@ -158,7 +158,7 @@ namespace OpenSim.Grid.UserServer response.SeedCapability = SimInfo.httpServerURI + "CAPS/" + capsPath + "0000/"; // Notify the target of an incoming user - MainLog.Instance.Verbose("Notifying " + SimInfo.regionName + " (" + SimInfo.serverURI + ")"); + MainLog.Instance.Verbose("LOGIN", "Notifying " + SimInfo.regionName + " (" + SimInfo.serverURI + ")"); // Update agent with target sim theUser.currentAgent.currentRegion = SimInfo.UUID; @@ -180,7 +180,7 @@ namespace OpenSim.Grid.UserServer ArrayList SendParams = new ArrayList(); SendParams.Add(SimParams); - MainLog.Instance.Verbose("Informing region --> " + SimInfo.httpServerURI); + MainLog.Instance.Verbose("LOGIN", "Informing region at " + SimInfo.httpServerURI); // Send XmlRpcRequest GridReq = new XmlRpcRequest("expect_user", SendParams); XmlRpcResponse GridResp = GridReq.Send(SimInfo.httpServerURI, 6000); @@ -188,8 +188,8 @@ namespace OpenSim.Grid.UserServer catch (Exception e) { - MainLog.Instance.Warn("Default region also not available"); - MainLog.Instance.Verbose(e.ToString()); + MainLog.Instance.Warn("LOGIN", "Default region also not available"); + MainLog.Instance.Verbose("LOGIN", e.ToString()); } } diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs index 50018ac804..2e089b8072 100644 --- a/OpenSim/Region/Application/OpenSimMain.cs +++ b/OpenSim/Region/Application/OpenSimMain.cs @@ -782,12 +782,12 @@ namespace OpenSim if (m_sceneManager.CurrentScene == null) { - MainLog.Instance.Verbose( + MainLog.Instance.Verbose("CONSOLE", "Currently at Root level. To change region please use 'change-region '"); } else { - MainLog.Instance.Verbose("Current Region: " + m_sceneManager.CurrentScene.RegionInfo.RegionName + + MainLog.Instance.Verbose("CONSOLE", "Current Region: " + m_sceneManager.CurrentScene.RegionInfo.RegionName + ". To change region please use 'change-region '"); } diff --git a/OpenSim/Region/ClientStack/ClientView.cs b/OpenSim/Region/ClientStack/ClientView.cs index 1c16a95c7c..56ab5d682b 100644 --- a/OpenSim/Region/ClientStack/ClientView.cs +++ b/OpenSim/Region/ClientStack/ClientView.cs @@ -453,11 +453,11 @@ namespace OpenSim.Region.ClientStack if (bytesSent > throttleOutboundMax) { PacketQueue.Enqueue(nextPacket); - MainLog.Instance.Verbose("Client over throttle limit, requeuing packet"); + MainLog.Instance.Verbose("THROTTLE", "Client over throttle limit, requeuing packet"); if (queuedLast) { - MainLog.Instance.Verbose("No more sendable packets, need to sleep now"); + MainLog.Instance.Verbose("THROTTLE", "No more sendable packets, need to sleep now"); Thread.Sleep(100); // Wait a little while if this was the last packet we saw } @@ -2485,7 +2485,7 @@ namespace OpenSim.Region.ClientStack { if ((now - packet.TickCount > RESEND_TIMEOUT) && (!packet.Header.Resent)) { - MainLog.Instance.Verbose("Resending " + packet.Type.ToString() + " packet, " + + MainLog.Instance.Verbose("NETWORK", "Resending " + packet.Type.ToString() + " packet, " + (now - packet.TickCount) + "ms have passed"); packet.Header.Resent = true; @@ -2504,7 +2504,7 @@ namespace OpenSim.Region.ClientStack if (PendingAcks.Count > 250) { // FIXME: Handle the odd case where we have too many pending ACKs queued up - MainLog.Instance.Verbose("Too many ACKs queued up!"); + MainLog.Instance.Verbose("NETWORK", "Too many ACKs queued up!"); return; } diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs index 4c0c02dcc6..5b43fec395 100644 --- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs +++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs @@ -79,7 +79,7 @@ namespace OpenSim.Region.ClientStack m_httpServer = new BaseHttpServer(m_httpServerPort); - m_log.Verbose("Starting HTTP server"); + m_log.Status("REGION", "Starting HTTP server"); m_httpServer.Start(); } diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs index f4e858bd3a..b11a91f3c9 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs @@ -433,7 +433,7 @@ namespace OpenSim.Region.Communications.OGS1 m_localBackend.TriggerExpectUser(regionHandle, agentData); - MainLog.Instance.Verbose("ExpectUser() - Welcoming new user..."); + MainLog.Instance.Verbose("GRID", "Welcoming new user..."); return new XmlRpcResponse(); } diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs index b84115492e..475066e15c 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs @@ -50,7 +50,7 @@ namespace OpenSim.Region.Communications.OGS1 { if (data.Contains("error_type")) { - Console.WriteLine("Error sent by user server when trying to get user profile: (" + data["error_type"] + + OpenSim.Framework.Console.MainLog.Instance.Warn("GRID", "Error sent by user server when trying to get user profile: (" + data["error_type"] + "): " + data["error_desc"]); return null; } diff --git a/OpenSim/Region/Environment/Modules/ChatModule.cs b/OpenSim/Region/Environment/Modules/ChatModule.cs index 82cec82ee3..924972b37c 100644 --- a/OpenSim/Region/Environment/Modules/ChatModule.cs +++ b/OpenSim/Region/Environment/Modules/ChatModule.cs @@ -306,7 +306,7 @@ namespace OpenSim.Region.Environment.Modules } catch (Exception) { - Console.WriteLine("No IRC config information, skipping IRC bridge configuration"); + OpenSim.Framework.Console.MainLog.Instance.Verbose("CHAT", "No IRC config information, skipping IRC bridge configuration"); } m_log = MainLog.Instance; } diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs index cceaa14915..290629c867 100644 --- a/OpenSim/Region/Environment/Scenes/InnerScene.cs +++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs @@ -700,7 +700,7 @@ namespace OpenSim.Region.Environment.Scenes } else { - OpenSim.Framework.Console.MainLog.Instance.Verbose( + OpenSim.Framework.Console.MainLog.Instance.Verbose("SCENE", "DelinkObjects(): Could not find a root prim out of {0} as given to a delink request!", primIds); } diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index e671038c30..f9cace2b2b 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs @@ -239,12 +239,12 @@ namespace OpenSim.Region.Environment.Scenes RegisterDefaultSceneEvents(); - MainLog.Instance.Verbose("Creating new entitities instance"); + MainLog.Instance.Verbose("SCENE", "Creating new entitities instance"); Entities = new Dictionary(); m_scenePresences = new Dictionary(); m_sceneObjects = new Dictionary(); - MainLog.Instance.Verbose("Creating LandMap"); + MainLog.Instance.Verbose("SCENE", "Creating LandMap"); Terrain = new TerrainEngine((int)RegionInfo.RegionLocX, (int)RegionInfo.RegionLocY); ScenePresence.LoadAnims(); @@ -727,7 +727,7 @@ namespace OpenSim.Region.Environment.Scenes /// public virtual void LoadPrimsFromStorage(bool m_permissions) { - MainLog.Instance.Verbose("Loading objects from datastore"); + MainLog.Instance.Verbose("SCENE", "Loading objects from datastore"); List PrimsFromDB = m_storageManager.DataStore.LoadObjects(m_regInfo.RegionID); foreach (SceneObjectGroup prim in PrimsFromDB) { @@ -759,7 +759,7 @@ namespace OpenSim.Region.Environment.Scenes rootPart.RotationOffset.Y, rootPart.RotationOffset.Z), UsePhysics); rootPart.DoPhysicsPropertyUpdate(UsePhysics, true); } - MainLog.Instance.Verbose("Loaded " + PrimsFromDB.Count.ToString() + " SceneObject(s)"); + MainLog.Instance.Verbose("SCENE", "Loaded " + PrimsFromDB.Count.ToString() + " SceneObject(s)"); } diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs index 193677e6a0..eb8b767d76 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs @@ -943,7 +943,7 @@ namespace OpenSim.Region.Environment.Scenes } else { - OpenSim.Framework.Console.MainLog.Instance.Verbose( + OpenSim.Framework.Console.MainLog.Instance.Verbose("SCENE", "DelinkFromGroup(): Child prim local id {0} not found in object with root prim id {1}", partID, LocalId); } diff --git a/OpenSim/Region/ExtensionsScriptModule/Script.cs b/OpenSim/Region/ExtensionsScriptModule/Script.cs index 5f857996b4..350ca2d76f 100644 --- a/OpenSim/Region/ExtensionsScriptModule/Script.cs +++ b/OpenSim/Region/ExtensionsScriptModule/Script.cs @@ -53,7 +53,7 @@ namespace OpenSim.Region.ExtensionsScriptModule private void events_OnNewPresence(ScenePresence presence) { - script.logger.Verbose("Hello " + presence.Firstname.ToString() + "!"); + script.logger.Verbose("TESTSCRIPT", "Hello " + presence.Firstname.ToString() + "!"); } private void events_OnFrame() diff --git a/OpenSim/Region/ExtensionsScriptModule/ScriptManager.cs b/OpenSim/Region/ExtensionsScriptModule/ScriptManager.cs index 8cd94c325c..dd70ad5485 100644 --- a/OpenSim/Region/ExtensionsScriptModule/ScriptManager.cs +++ b/OpenSim/Region/ExtensionsScriptModule/ScriptManager.cs @@ -48,12 +48,12 @@ namespace OpenSim.Region.ExtensionsScriptModule { ScriptInfo scriptInfo = new ScriptInfo(m_scene); // Since each script could potentially corrupt their access with a stray assignment, making a new one for each script. - MainLog.Instance.Verbose("Loading " + script.Key); + MainLog.Instance.Verbose("SCRIPT", "Loading " + script.Key); script.Value.Initialise(scriptInfo); scripts.Add(script.Value); } - MainLog.Instance.Verbose(string.Format("Finished loading {0} script(s)", compiledscripts.Count)); + MainLog.Instance.Verbose("SCRIPT", string.Format("Finished loading {0} script(s)", compiledscripts.Count)); } public ScriptManager() @@ -125,7 +125,7 @@ namespace OpenSim.Region.ExtensionsScriptModule public bool AddPreCompiledScript(IScript script) { - MainLog.Instance.Verbose("Loading script " + script.Name); + MainLog.Instance.Verbose("SCRIPT", "Loading script " + script.Name); ScriptInfo scriptInfo = new ScriptInfo(m_scene); // Since each script could potentially corrupt their access with a stray assignment, making a new one for each script. script.Initialise(scriptInfo); diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs index 635b208ae9..56a18429dd 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs @@ -92,7 +92,7 @@ namespace OpenSim.Region.Physics.Manager public override PhysicsActor AddAvatar(string avName, PhysicsVector position) { - MainLog.Instance.Verbose("NullPhysicsScene : AddAvatar({0})", position); + MainLog.Instance.Verbose("PHYSICS", "NullPhysicsScene : AddAvatar({0})", position); return PhysicsActor.Null; } @@ -119,7 +119,7 @@ namespace OpenSim.Region.Physics.Manager public override PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, PhysicsVector position, PhysicsVector size, Quaternion rotation, bool isPhysical) { - MainLog.Instance.Verbose("NullPhysicsScene : AddPrim({0},{1})", position, size); + MainLog.Instance.Verbose("PHYSICS", "NullPhysicsScene : AddPrim({0},{1})", position, size); return PhysicsActor.Null; } public override void AddPhysicsActorTaint(PhysicsActor prim) @@ -135,12 +135,12 @@ namespace OpenSim.Region.Physics.Manager public override void GetResults() { - MainLog.Instance.Verbose("NullPhysicsScene : GetResults()"); + MainLog.Instance.Verbose("PHYSICS", "NullPhysicsScene : GetResults()"); } public override void SetTerrain(float[] heightMap) { - MainLog.Instance.Verbose("NullPhysicsScene : SetTerrain({0} items)", heightMap.Length); + MainLog.Instance.Verbose("PHYSICS", "NullPhysicsScene : SetTerrain({0} items)", heightMap.Length); } 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 83d3d8203b..5285b8257c 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 catch (Exception e) { MainLog.Instance.Error("DATASTORE", "Failed create prim object, exception and data follows"); - MainLog.Instance.Verbose(e.ToString()); + MainLog.Instance.Verbose("DATASTORE", e.ToString()); foreach (DataColumn col in prims.Columns) { - MainLog.Instance.Verbose("Col: " + col.ColumnName + " => " + primRow[col]); + MainLog.Instance.Verbose("DATASTORE", "Col: " + col.ColumnName + " => " + primRow[col]); } } }