4 files changed, 22 insertions, 22 deletions

diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs
index 691ed57..404fbdc 100644
--- a/OpenSim/Grid/GridServer/GridManager.cs
+++ b/OpenSim/Grid/GridServer/GridManager.cs
@@ -52,10 +52,10 @@ namespace OpenSim.Grid.GridServer
         /// <param name="FileName">The filename to the grid server plugin DLL</param>
         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<string, IGridData> 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 9b1892d..b793cf9 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 c03c4f0..c834690 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 ef4b82d..4d1328e 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());
                 }
 
             }