diff options
Diffstat (limited to 'OpenSim/Server')
3 files changed, 4 insertions, 10 deletions
diff --git a/OpenSim/Server/Handlers/Hypergrid/HomeAgentHandlers.cs b/OpenSim/Server/Handlers/Hypergrid/HomeAgentHandlers.cs index f37f2f1..04bb9e8 100644 --- a/OpenSim/Server/Handlers/Hypergrid/HomeAgentHandlers.cs +++ b/OpenSim/Server/Handlers/Hypergrid/HomeAgentHandlers.cs | |||
@@ -85,7 +85,7 @@ namespace OpenSim.Server.Handlers.Hypergrid | |||
85 | data.destinationServerURI = args["destination_serveruri"]; | 85 | data.destinationServerURI = args["destination_serveruri"]; |
86 | 86 | ||
87 | } | 87 | } |
88 | catch (InvalidCastException e) | 88 | catch (InvalidCastException) |
89 | { | 89 | { |
90 | m_log.ErrorFormat("[HOME AGENT HANDLER]: Bad cast in UnpackData"); | 90 | m_log.ErrorFormat("[HOME AGENT HANDLER]: Bad cast in UnpackData"); |
91 | } | 91 | } |
diff --git a/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs b/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs index d9c1bd3..7137836 100644 --- a/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs +++ b/OpenSim/Server/Handlers/Hypergrid/UserAgentServerConnector.cs | |||
@@ -453,7 +453,6 @@ namespace OpenSim.Server.Handlers.Hypergrid | |||
453 | XmlRpcResponse response = new XmlRpcResponse(); | 453 | XmlRpcResponse response = new XmlRpcResponse(); |
454 | response.Value = hash; | 454 | response.Value = hash; |
455 | return response; | 455 | return response; |
456 | |||
457 | } | 456 | } |
458 | 457 | ||
459 | /// <summary> | 458 | /// <summary> |
@@ -471,9 +470,7 @@ namespace OpenSim.Server.Handlers.Hypergrid | |||
471 | //string portstr = (string)requestData["port"]; | 470 | //string portstr = (string)requestData["port"]; |
472 | if (requestData.ContainsKey("first") && requestData.ContainsKey("last")) | 471 | if (requestData.ContainsKey("first") && requestData.ContainsKey("last")) |
473 | { | 472 | { |
474 | UUID userID = UUID.Zero; | ||
475 | string first = (string)requestData["first"]; | 473 | string first = (string)requestData["first"]; |
476 | |||
477 | string last = (string)requestData["last"]; | 474 | string last = (string)requestData["last"]; |
478 | UUID uuid = m_HomeUsersService.GetUUID(first, last); | 475 | UUID uuid = m_HomeUsersService.GetUUID(first, last); |
479 | hash["UUID"] = uuid.ToString(); | 476 | hash["UUID"] = uuid.ToString(); |
@@ -482,7 +479,6 @@ namespace OpenSim.Server.Handlers.Hypergrid | |||
482 | XmlRpcResponse response = new XmlRpcResponse(); | 479 | XmlRpcResponse response = new XmlRpcResponse(); |
483 | response.Value = hash; | 480 | response.Value = hash; |
484 | return response; | 481 | return response; |
485 | |||
486 | } | 482 | } |
487 | } | 483 | } |
488 | } | 484 | } \ No newline at end of file |
diff --git a/OpenSim/Server/Handlers/Profiles/UserProfilesConnector.cs b/OpenSim/Server/Handlers/Profiles/UserProfilesConnector.cs index f9a520a..28dbbc2 100644 --- a/OpenSim/Server/Handlers/Profiles/UserProfilesConnector.cs +++ b/OpenSim/Server/Handlers/Profiles/UserProfilesConnector.cs | |||
@@ -39,8 +39,7 @@ namespace OpenSim.Server.Handlers.Profiles | |||
39 | { | 39 | { |
40 | public class UserProfilesConnector: ServiceConnector | 40 | public class UserProfilesConnector: ServiceConnector |
41 | { | 41 | { |
42 | static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 42 | // static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
43 | |||
44 | 43 | ||
45 | // Our Local Module | 44 | // Our Local Module |
46 | public IUserProfilesService ServiceModule | 45 | public IUserProfilesService ServiceModule |
@@ -110,5 +109,4 @@ namespace OpenSim.Server.Handlers.Profiles | |||
110 | Server.AddJsonRPCHandler("user_data_update", handler.UpdateUserAppData); | 109 | Server.AddJsonRPCHandler("user_data_update", handler.UpdateUserAppData); |
111 | } | 110 | } |
112 | } | 111 | } |
113 | } | 112 | } \ No newline at end of file |
114 | |||