Dump OpenSim 0.9.0.1 into it's own branch.

1 files changed, 9 insertions, 8 deletions

diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs
index 13512a2..091b197 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs
@@ -65,9 +65,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
         protected override byte[] ProcessRequest(
             string path, Stream requestData, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
         {
-            StreamReader sr = new StreamReader(requestData);
-            string body = sr.ReadToEnd();
-            sr.Close();
+            string body;
+            using(StreamReader sr = new StreamReader(requestData))
+                body = sr.ReadToEnd();
+
             body = body.Trim();
 
             //m_log.DebugFormat("[XXX]: query String: {0}", body);
@@ -127,7 +128,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
             UserAccount account = m_FriendsModule.UserAccountService.GetUserAccount(UUID.Zero, fromID);
             string name = (account == null) ? "Unknown" : account.FirstName + " " + account.LastName;
 
-            GridInstantMessage im = new GridInstantMessage(m_FriendsModule.Scene, fromID, name, toID, 
+            GridInstantMessage im = new GridInstantMessage(m_FriendsModule.Scene, fromID, name, toID,
                 (byte)InstantMessageDialog.FriendshipOffered, message, false, Vector3.Zero);
 
             // !! HACK
@@ -211,7 +212,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
         {
             UUID fromID = UUID.Zero;
             UUID toID = UUID.Zero;
-            int rights = 0, userFlags = 0;
+            int oldRights = 0, newRights = 0;
 
             if (!request.ContainsKey("FromID") || !request.ContainsKey("ToID"))
                 return FailureResult();
@@ -222,13 +223,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
             if (!UUID.TryParse(request["ToID"].ToString(), out toID))
                 return FailureResult();
 
-            if (!Int32.TryParse(request["UserFlags"].ToString(), out userFlags))
+            if (!Int32.TryParse(request["UserFlags"].ToString(), out oldRights))
                 return FailureResult();
 
-            if (!Int32.TryParse(request["Rights"].ToString(), out rights))
+            if (!Int32.TryParse(request["Rights"].ToString(), out newRights))
                 return FailureResult();
 
-            if (m_FriendsModule.LocalGrantRights(UUID.Zero, UUID.Zero, userFlags, rights))
+            if (m_FriendsModule.LocalGrantRights(fromID, toID, oldRights, newRights))
                 return SuccessResult();
 
             return FailureResult();