diff options
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | 6 | ||||
-rw-r--r-- | OpenSim/Services/Connectors/Friends/FriendsServiceConnector.cs | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs index 3b0fd8e..1e22fcc 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs | |||
@@ -903,8 +903,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
903 | 903 | ||
904 | private void HandleUseCircuitCode(object o) | 904 | private void HandleUseCircuitCode(object o) |
905 | { | 905 | { |
906 | IPEndPoint remoteEndPoint; | 906 | IPEndPoint remoteEndPoint = null; |
907 | IClientAPI client; | 907 | IClientAPI client = null; |
908 | 908 | ||
909 | try | 909 | try |
910 | { | 910 | { |
@@ -957,7 +957,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
957 | "[LLUDPSERVER]: UseCircuitCode handling from endpoint {0}, client {1} {2} failed. Exception {3}{4}", | 957 | "[LLUDPSERVER]: UseCircuitCode handling from endpoint {0}, client {1} {2} failed. Exception {3}{4}", |
958 | remoteEndPoint != null ? remoteEndPoint.ToString() : "n/a", | 958 | remoteEndPoint != null ? remoteEndPoint.ToString() : "n/a", |
959 | client != null ? client.Name : "unknown", | 959 | client != null ? client.Name : "unknown", |
960 | client != null ? client.AgentId : "unknown", | 960 | client != null ? client.AgentId.ToString() : "unknown", |
961 | e.Message, | 961 | e.Message, |
962 | e.StackTrace); | 962 | e.StackTrace); |
963 | } | 963 | } |
diff --git a/OpenSim/Services/Connectors/Friends/FriendsServiceConnector.cs b/OpenSim/Services/Connectors/Friends/FriendsServiceConnector.cs index 44138c9..b1dd84e 100644 --- a/OpenSim/Services/Connectors/Friends/FriendsServiceConnector.cs +++ b/OpenSim/Services/Connectors/Friends/FriendsServiceConnector.cs | |||
@@ -220,7 +220,7 @@ namespace OpenSim.Services.Connectors.Friends | |||
220 | public bool Delete(Dictionary<string, object> sendData, string PrincipalID, string Friend) | 220 | public bool Delete(Dictionary<string, object> sendData, string PrincipalID, string Friend) |
221 | { | 221 | { |
222 | string reply = string.Empty; | 222 | string reply = string.Empty; |
223 | string uri = m_ServerURI = "/friends"; | 223 | string uri = m_ServerURI + "/friends"; |
224 | try | 224 | try |
225 | { | 225 | { |
226 | reply = SynchronousRestFormsRequester.MakeRequest("POST", uri, ServerUtils.BuildQueryString(sendData)); | 226 | reply = SynchronousRestFormsRequester.MakeRequest("POST", uri, ServerUtils.BuildQueryString(sendData)); |