diff options
Diffstat (limited to 'OpenSim/Grid/UserServer/UserManager.cs')
-rw-r--r-- | OpenSim/Grid/UserServer/UserManager.cs | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/OpenSim/Grid/UserServer/UserManager.cs b/OpenSim/Grid/UserServer/UserManager.cs index c36de7f..8f2d83c 100644 --- a/OpenSim/Grid/UserServer/UserManager.cs +++ b/OpenSim/Grid/UserServer/UserManager.cs | |||
@@ -39,6 +39,8 @@ namespace OpenSim.Grid.UserServer | |||
39 | { | 39 | { |
40 | public class UserManager : UserManagerBase | 40 | public class UserManager : UserManagerBase |
41 | { | 41 | { |
42 | private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | ||
43 | |||
42 | /// <summary> | 44 | /// <summary> |
43 | /// Deletes an active agent session | 45 | /// Deletes an active agent session |
44 | /// </summary> | 46 | /// </summary> |
@@ -106,6 +108,7 @@ namespace OpenSim.Grid.UserServer | |||
106 | 108 | ||
107 | return response; | 109 | return response; |
108 | } | 110 | } |
111 | |||
109 | /// <summary> | 112 | /// <summary> |
110 | /// Converts a user profile to an XML element which can be returned | 113 | /// Converts a user profile to an XML element which can be returned |
111 | /// </summary> | 114 | /// </summary> |
@@ -202,7 +205,6 @@ namespace OpenSim.Grid.UserServer | |||
202 | responseData["returnString"] = returnString; | 205 | responseData["returnString"] = returnString; |
203 | response.Value = responseData; | 206 | response.Value = responseData; |
204 | return response; | 207 | return response; |
205 | |||
206 | } | 208 | } |
207 | 209 | ||
208 | public XmlRpcResponse XmlRpcResponseXmlRPCUpdateUserFriendPerms(XmlRpcRequest request) | 210 | public XmlRpcResponse XmlRpcResponseXmlRPCUpdateUserFriendPerms(XmlRpcRequest request) |
@@ -212,8 +214,6 @@ namespace OpenSim.Grid.UserServer | |||
212 | Hashtable responseData = new Hashtable(); | 214 | Hashtable responseData = new Hashtable(); |
213 | string returnString = "FALSE"; | 215 | string returnString = "FALSE"; |
214 | 216 | ||
215 | |||
216 | |||
217 | if (requestData.Contains("ownerID") && requestData.Contains("friendID") && requestData.Contains("friendPerms")) | 217 | if (requestData.Contains("ownerID") && requestData.Contains("friendID") && requestData.Contains("friendPerms")) |
218 | { | 218 | { |
219 | UpdateUserFriendPerms(new LLUUID((string)requestData["ownerID"]), new LLUUID((string)requestData["friendID"]), (uint)Convert.ToInt32((string)requestData["friendPerms"])); | 219 | UpdateUserFriendPerms(new LLUUID((string)requestData["ownerID"]), new LLUUID((string)requestData["friendID"]), (uint)Convert.ToInt32((string)requestData["friendPerms"])); |
@@ -233,8 +233,6 @@ namespace OpenSim.Grid.UserServer | |||
233 | 233 | ||
234 | List<FriendListItem> returndata = new List<FriendListItem>(); | 234 | List<FriendListItem> returndata = new List<FriendListItem>(); |
235 | 235 | ||
236 | |||
237 | |||
238 | if (requestData.Contains("ownerID")) | 236 | if (requestData.Contains("ownerID")) |
239 | { | 237 | { |
240 | returndata = this.GetUserFriendList(new LLUUID((string)requestData["ownerID"])); | 238 | returndata = this.GetUserFriendList(new LLUUID((string)requestData["ownerID"])); |
@@ -309,7 +307,6 @@ namespace OpenSim.Grid.UserServer | |||
309 | return CreateUnknownUserErrorResponse(); | 307 | return CreateUnknownUserErrorResponse(); |
310 | } | 308 | } |
311 | 309 | ||
312 | |||
313 | return ProfileToXmlRPCResponse(userProfile); | 310 | return ProfileToXmlRPCResponse(userProfile); |
314 | } | 311 | } |
315 | 312 | ||
@@ -318,7 +315,6 @@ namespace OpenSim.Grid.UserServer | |||
318 | XmlRpcResponse response = new XmlRpcResponse(); | 315 | XmlRpcResponse response = new XmlRpcResponse(); |
319 | Hashtable requestData = (Hashtable)request.Params[0]; | 316 | Hashtable requestData = (Hashtable)request.Params[0]; |
320 | 317 | ||
321 | |||
322 | UserProfileData userProfile; | 318 | UserProfileData userProfile; |
323 | 319 | ||
324 | if (requestData.Contains("avatar_uuid")) | 320 | if (requestData.Contains("avatar_uuid")) |
@@ -336,17 +332,15 @@ namespace OpenSim.Grid.UserServer | |||
336 | } | 332 | } |
337 | catch (FormatException) | 333 | catch (FormatException) |
338 | { | 334 | { |
339 | OpenSim.Framework.Console.MainLog.Instance.Warn("LOGOUT", "Error in Logout XMLRPC Params"); | 335 | m_log.Warn("[LOGOUT]: Error in Logout XMLRPC Params"); |
340 | return response; | 336 | return response; |
341 | } | 337 | } |
342 | |||
343 | } | 338 | } |
344 | else | 339 | else |
345 | { | 340 | { |
346 | return CreateUnknownUserErrorResponse(); | 341 | return CreateUnknownUserErrorResponse(); |
347 | } | 342 | } |
348 | 343 | ||
349 | |||
350 | return response; | 344 | return response; |
351 | } | 345 | } |
352 | 346 | ||