From 80ec2ac167713a4561938697a259e2a9681dadd4 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 16 Feb 2012 01:39:12 +0000
Subject: Correct a bug introduced in 1f402fdf (Feb 7 2012) where the delete
 friends grid call would try and contact the wrong uri.  Also fixes the build
 from df960d5

---
 OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs           | 6 +++---
 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
 
         private void HandleUseCircuitCode(object o)
         {
-            IPEndPoint remoteEndPoint;
-            IClientAPI client;
+            IPEndPoint remoteEndPoint = null;
+            IClientAPI client = null;
 
             try
             {
@@ -957,7 +957,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                     "[LLUDPSERVER]: UseCircuitCode handling from endpoint {0}, client {1} {2} failed.  Exception {3}{4}",
                     remoteEndPoint != null ? remoteEndPoint.ToString() : "n/a",
                     client != null ? client.Name : "unknown",
-                    client != null ? client.AgentId : "unknown",
+                    client != null ? client.AgentId.ToString() : "unknown",
                     e.Message,
                     e.StackTrace);
             }
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
         public bool Delete(Dictionary<string, object> sendData, string PrincipalID, string Friend)
         {
             string reply = string.Empty;
-            string uri = m_ServerURI = "/friends";
+            string uri = m_ServerURI + "/friends";
             try
             {
                 reply = SynchronousRestFormsRequester.MakeRequest("POST", uri, ServerUtils.BuildQueryString(sendData));
-- 
cgit v1.1