Revert "Merge master into teravuswork", it should have been avination, not master.

This reverts commit dfac269032300872c4d0dc507f4f9062d102b0f4, reversing
changes made to 619c39e5144f15aca129d6d999bcc5c34133ee64.

1 files changed, 0 insertions, 18 deletions

diff --git a/OpenSim/Server/Handlers/Avatar/AvatarServerPostHandler.cs b/OpenSim/Server/Handlers/Avatar/AvatarServerPostHandler.cs
index 8cd747e..393584e 100644
--- a/OpenSim/Server/Handlers/Avatar/AvatarServerPostHandler.cs
+++ b/OpenSim/Server/Handlers/Avatar/AvatarServerPostHandler.cs
@@ -137,8 +137,6 @@ namespace OpenSim.Server.Handlers.Avatar
             if (!UUID.TryParse(request["UserID"].ToString(), out user))
                 return FailureResult();
 
-            RemoveRequestParamsNotForStorage(request);
-
             AvatarData avatar = new AvatarData(request);
             if (m_AvatarService.SetAvatar(user, avatar))
                 return SuccessResult();
@@ -155,25 +153,11 @@ namespace OpenSim.Server.Handlers.Avatar
             if (!UUID.TryParse(request["UserID"].ToString(), out user))
                 return FailureResult();
 
-            RemoveRequestParamsNotForStorage(request);
-
             if (m_AvatarService.ResetAvatar(user))
                 return SuccessResult();
 
             return FailureResult();
         }
-
-        /// <summary>
-        /// Remove parameters that were used to invoke the method and should not in themselves be persisted.
-        /// </summary>
-        /// <param name='request'></param>
-        private void RemoveRequestParamsNotForStorage(Dictionary<string, object> request)
-        {
-            request.Remove("VERSIONMAX");
-            request.Remove("VERSIONMIN");
-            request.Remove("METHOD");
-            request.Remove("UserID");
-        }
         
         byte[] SetItems(Dictionary<string, object> request)
         {
@@ -189,8 +173,6 @@ namespace OpenSim.Server.Handlers.Avatar
             if (!(request["Names"] is List<string> || request["Values"] is List<string>))
                 return FailureResult();
 
-            RemoveRequestParamsNotForStorage(request);
-
             List<string> _names = (List<string>)request["Names"];
             names = _names.ToArray();
             List<string> _values = (List<string>)request["Values"];