aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/Communications/LoginService.cs4
-rw-r--r--OpenSim/Framework/Communications/UserManagerBase.cs25
-rw-r--r--OpenSim/Framework/Console/LogBase.cs1
3 files changed, 15 insertions, 15 deletions
diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs
index e7441b8..d18cf63 100644
--- a/OpenSim/Framework/Communications/LoginService.cs
+++ b/OpenSim/Framework/Communications/LoginService.cs
@@ -158,7 +158,7 @@ namespace OpenSim.Framework.UserManagement
158 } 158 }
159 catch (Exception e) 159 catch (Exception e)
160 { 160 {
161 MainLog.Instance.Verbose(e.ToString()); 161 MainLog.Instance.Verbose("LOGIN", e.ToString());
162 return logResponse.CreateDeadRegionResponse(); 162 return logResponse.CreateDeadRegionResponse();
163 //return logResponse.ToXmlRpcResponse(); 163 //return logResponse.ToXmlRpcResponse();
164 } 164 }
@@ -168,7 +168,7 @@ namespace OpenSim.Framework.UserManagement
168 168
169 catch (Exception E) 169 catch (Exception E)
170 { 170 {
171 MainLog.Instance.Verbose(E.ToString()); 171 MainLog.Instance.Verbose("LOGIN", E.ToString());
172 } 172 }
173 //} 173 //}
174 } 174 }
diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs
index 119f8a5..88214cd 100644
--- a/OpenSim/Framework/Communications/UserManagerBase.cs
+++ b/OpenSim/Framework/Communications/UserManagerBase.cs
@@ -50,10 +50,10 @@ namespace OpenSim.Framework.UserManagement
50 { 50 {
51 if (!String.IsNullOrEmpty(FileName)) 51 if (!String.IsNullOrEmpty(FileName))
52 { 52 {
53 MainLog.Instance.Verbose("Userstorage: Attempting to load " + FileName); 53 MainLog.Instance.Verbose("USERSTORAGE", "Attempting to load " + FileName);
54 Assembly pluginAssembly = Assembly.LoadFrom(FileName); 54 Assembly pluginAssembly = Assembly.LoadFrom(FileName);
55 55
56 MainLog.Instance.Verbose("Userstorage: Found " + pluginAssembly.GetTypes().Length + " interfaces."); 56 MainLog.Instance.Verbose("USERSTORAGE", "Found " + pluginAssembly.GetTypes().Length + " interfaces.");
57 foreach (Type pluginType in pluginAssembly.GetTypes()) 57 foreach (Type pluginType in pluginAssembly.GetTypes())
58 { 58 {
59 if (!pluginType.IsAbstract) 59 if (!pluginType.IsAbstract)
@@ -75,7 +75,7 @@ namespace OpenSim.Framework.UserManagement
75 { 75 {
76 plug.Initialise(); 76 plug.Initialise();
77 _plugins.Add(plug.getName(), plug); 77 _plugins.Add(plug.getName(), plug);
78 MainLog.Instance.Verbose("Userstorage: Added IUserData Interface"); 78 MainLog.Instance.Verbose("USERSTORAGE", "Added IUserData Interface");
79 } 79 }
80 80
81 #region Get UserProfile 81 #region Get UserProfile
@@ -97,7 +97,7 @@ namespace OpenSim.Framework.UserManagement
97 } 97 }
98 catch (Exception e) 98 catch (Exception e)
99 { 99 {
100 MainLog.Instance.Verbose("Unable to find user via " + plugin.Key + "(" + e.ToString() + ")"); 100 MainLog.Instance.Verbose("USERSTORAGE", "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
101 } 101 }
102 } 102 }
103 103
@@ -116,7 +116,7 @@ namespace OpenSim.Framework.UserManagement
116 } 116 }
117 catch (Exception) 117 catch (Exception)
118 { 118 {
119 MainLog.Instance.Verbose("Unable to generate AgentPickerData via " + plugin.Key + "(" + query + ")"); 119 MainLog.Instance.Verbose("USERSTORAGE", "Unable to generate AgentPickerData via " + plugin.Key + "(" + query + ")");
120 return new List<AvatarPickerAvatar>(); 120 return new List<AvatarPickerAvatar>();
121 } 121 }
122 } 122 }
@@ -141,8 +141,7 @@ namespace OpenSim.Framework.UserManagement
141 } 141 }
142 catch (Exception e) 142 catch (Exception e)
143 { 143 {
144 System.Console.WriteLine("EEK!"); 144 MainLog.Instance.Verbose("USERSTORAGE", "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
145 MainLog.Instance.Verbose("Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
146 } 145 }
147 } 146 }
148 147
@@ -169,7 +168,7 @@ namespace OpenSim.Framework.UserManagement
169 } 168 }
170 catch (Exception e) 169 catch (Exception e)
171 { 170 {
172 MainLog.Instance.Verbose("Unable to find user via " + plugin.Key + "(" + e.ToString() + ")"); 171 MainLog.Instance.Verbose("USERSTORAGE", "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
173 } 172 }
174 } 173 }
175 174
@@ -193,7 +192,7 @@ namespace OpenSim.Framework.UserManagement
193 } 192 }
194 catch (Exception e) 193 catch (Exception e)
195 { 194 {
196 MainLog.Instance.Verbose("Unable to set user via " + plugin.Key + "(" + e.ToString() + ")"); 195 MainLog.Instance.Verbose("USERSTORAGE", "Unable to set user via " + plugin.Key + "(" + e.ToString() + ")");
197 } 196 }
198 } 197 }
199 198
@@ -219,7 +218,7 @@ namespace OpenSim.Framework.UserManagement
219 } 218 }
220 catch (Exception e) 219 catch (Exception e)
221 { 220 {
222 MainLog.Instance.Verbose("Unable to find user via " + plugin.Key + "(" + e.ToString() + ")"); 221 MainLog.Instance.Verbose("USERSTORAGE", "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
223 } 222 }
224 } 223 }
225 224
@@ -241,7 +240,7 @@ namespace OpenSim.Framework.UserManagement
241 } 240 }
242 catch (Exception e) 241 catch (Exception e)
243 { 242 {
244 MainLog.Instance.Verbose("Unable to find user via " + plugin.Key + "(" + e.ToString() + ")"); 243 MainLog.Instance.Verbose("USERSTORAGE", "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
245 } 244 }
246 } 245 }
247 246
@@ -274,7 +273,7 @@ namespace OpenSim.Framework.UserManagement
274 } 273 }
275 catch (Exception e) 274 catch (Exception e)
276 { 275 {
277 MainLog.Instance.Verbose("Unable to find user via " + plugin.Key + "(" + e.ToString() + ")"); 276 MainLog.Instance.Verbose("USERSTORAGE", "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
278 } 277 }
279 } 278 }
280 279
@@ -388,7 +387,7 @@ namespace OpenSim.Framework.UserManagement
388 } 387 }
389 catch (Exception e) 388 catch (Exception e)
390 { 389 {
391 MainLog.Instance.Verbose("Unable to add user via " + plugin.Key + "(" + e.ToString() + ")"); 390 MainLog.Instance.Verbose("USERSTORAGE", "Unable to add user via " + plugin.Key + "(" + e.ToString() + ")");
392 } 391 }
393 } 392 }
394 393
diff --git a/OpenSim/Framework/Console/LogBase.cs b/OpenSim/Framework/Console/LogBase.cs
index 6c97768..99c0128 100644
--- a/OpenSim/Framework/Console/LogBase.cs
+++ b/OpenSim/Framework/Console/LogBase.cs
@@ -168,6 +168,7 @@ namespace OpenSim.Framework.Console
168 /// </summary> 168 /// </summary>
169 /// <param name="format">The message to send</param> 169 /// <param name="format">The message to send</param>
170 /// <param name="args">WriteLine-style message arguments</param> 170 /// <param name="args">WriteLine-style message arguments</param>
171 [Obsolete("Please tag your console messages with the location your calling from")]
171 public void Verbose(string format, params object[] args) 172 public void Verbose(string format, params object[] args)
172 { 173 {
173 if (m_verbose) 174 if (m_verbose)