diff options
author | ubit | 2012-12-03 21:26:36 +0100 |
---|---|---|
committer | ubit | 2012-12-03 21:26:36 +0100 |
commit | 5d4b7d537d872d27c394402d3483c2a9bd2153f0 (patch) | |
tree | 39aae50386555bf024700314fb7bee5121a9d683 /OpenSim/Server/Handlers/Avatar | |
parent | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork (diff) | |
parent | Merge branch 'avination' into ubitwork (diff) | |
download | opensim-SC-5d4b7d537d872d27c394402d3483c2a9bd2153f0.zip opensim-SC-5d4b7d537d872d27c394402d3483c2a9bd2153f0.tar.gz opensim-SC-5d4b7d537d872d27c394402d3483c2a9bd2153f0.tar.bz2 opensim-SC-5d4b7d537d872d27c394402d3483c2a9bd2153f0.tar.xz |
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
Diffstat (limited to 'OpenSim/Server/Handlers/Avatar')
-rw-r--r-- | OpenSim/Server/Handlers/Avatar/AvatarServerPostHandler.cs | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/OpenSim/Server/Handlers/Avatar/AvatarServerPostHandler.cs b/OpenSim/Server/Handlers/Avatar/AvatarServerPostHandler.cs index 393584e..8cd747e 100644 --- a/OpenSim/Server/Handlers/Avatar/AvatarServerPostHandler.cs +++ b/OpenSim/Server/Handlers/Avatar/AvatarServerPostHandler.cs | |||
@@ -137,6 +137,8 @@ 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 | |||
140 | AvatarData avatar = new AvatarData(request); | 142 | AvatarData avatar = new AvatarData(request); |
141 | if (m_AvatarService.SetAvatar(user, avatar)) | 143 | if (m_AvatarService.SetAvatar(user, avatar)) |
142 | return SuccessResult(); | 144 | return SuccessResult(); |
@@ -153,11 +155,25 @@ namespace OpenSim.Server.Handlers.Avatar | |||
153 | if (!UUID.TryParse(request["UserID"].ToString(), out user)) | 155 | if (!UUID.TryParse(request["UserID"].ToString(), out user)) |
154 | return FailureResult(); | 156 | return FailureResult(); |
155 | 157 | ||
158 | RemoveRequestParamsNotForStorage(request); | ||
159 | |||
156 | if (m_AvatarService.ResetAvatar(user)) | 160 | if (m_AvatarService.ResetAvatar(user)) |
157 | return SuccessResult(); | 161 | return SuccessResult(); |
158 | 162 | ||
159 | return FailureResult(); | 163 | return FailureResult(); |
160 | } | 164 | } |
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 | } | ||
161 | 177 | ||
162 | byte[] SetItems(Dictionary<string, object> request) | 178 | byte[] SetItems(Dictionary<string, object> request) |
163 | { | 179 | { |
@@ -173,6 +189,8 @@ namespace OpenSim.Server.Handlers.Avatar | |||
173 | if (!(request["Names"] is List<string> || request["Values"] is List<string>)) | 189 | if (!(request["Names"] is List<string> || request["Values"] is List<string>)) |
174 | return FailureResult(); | 190 | return FailureResult(); |
175 | 191 | ||
192 | RemoveRequestParamsNotForStorage(request); | ||
193 | |||
176 | List<string> _names = (List<string>)request["Names"]; | 194 | List<string> _names = (List<string>)request["Names"]; |
177 | names = _names.ToArray(); | 195 | names = _names.ToArray(); |
178 | List<string> _values = (List<string>)request["Values"]; | 196 | List<string> _values = (List<string>)request["Values"]; |