diff options
Diffstat (limited to 'OpenSim/Server/Handlers/Avatar/AvatarServerPostHandler.cs')
-rw-r--r-- | OpenSim/Server/Handlers/Avatar/AvatarServerPostHandler.cs | 18 |
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 | |||
137 | if (!UUID.TryParse(request["UserID"].ToString(), out user)) | 137 | if (!UUID.TryParse(request["UserID"].ToString(), out user)) |
138 | return FailureResult(); | 138 | return FailureResult(); |
139 | 139 | ||
140 | RemoveRequestParamsNotForStorage(request); | ||
141 | |||
142 | AvatarData avatar = new AvatarData(request); | 140 | AvatarData avatar = new AvatarData(request); |
143 | if (m_AvatarService.SetAvatar(user, avatar)) | 141 | if (m_AvatarService.SetAvatar(user, avatar)) |
144 | return SuccessResult(); | 142 | return SuccessResult(); |
@@ -155,25 +153,11 @@ namespace OpenSim.Server.Handlers.Avatar | |||
155 | if (!UUID.TryParse(request["UserID"].ToString(), out user)) | 153 | if (!UUID.TryParse(request["UserID"].ToString(), out user)) |
156 | return FailureResult(); | 154 | return FailureResult(); |
157 | 155 | ||
158 | RemoveRequestParamsNotForStorage(request); | ||
159 | |||
160 | if (m_AvatarService.ResetAvatar(user)) | 156 | if (m_AvatarService.ResetAvatar(user)) |
161 | return SuccessResult(); | 157 | return SuccessResult(); |
162 | 158 | ||
163 | return FailureResult(); | 159 | return FailureResult(); |
164 | } | 160 | } |
165 | |||
166 | /// <summary> | ||
167 | /// Remove parameters that were used to invoke the method and should not in themselves be persisted. | ||
168 | /// </summary> | ||
169 | /// <param name='request'></param> | ||
170 | private void RemoveRequestParamsNotForStorage(Dictionary<string, object> request) | ||
171 | { | ||
172 | request.Remove("VERSIONMAX"); | ||
173 | request.Remove("VERSIONMIN"); | ||
174 | request.Remove("METHOD"); | ||
175 | request.Remove("UserID"); | ||
176 | } | ||
177 | 161 | ||
178 | byte[] SetItems(Dictionary<string, object> request) | 162 | byte[] SetItems(Dictionary<string, object> request) |
179 | { | 163 | { |
@@ -189,8 +173,6 @@ namespace OpenSim.Server.Handlers.Avatar | |||
189 | if (!(request["Names"] is List<string> || request["Values"] is List<string>)) | 173 | if (!(request["Names"] is List<string> || request["Values"] is List<string>)) |
190 | return FailureResult(); | 174 | return FailureResult(); |
191 | 175 | ||
192 | RemoveRequestParamsNotForStorage(request); | ||
193 | |||
194 | List<string> _names = (List<string>)request["Names"]; | 176 | List<string> _names = (List<string>)request["Names"]; |
195 | names = _names.ToArray(); | 177 | names = _names.ToArray(); |
196 | List<string> _values = (List<string>)request["Values"]; | 178 | List<string> _values = (List<string>)request["Values"]; |