diff options
| author | Melanie | 2010-03-30 21:34:27 +0100 |
|---|---|---|
| committer | Melanie | 2010-03-30 21:34:27 +0100 |
| commit | 5693870fe26fae35a28f2d5103780434f4f40e57 (patch) | |
| tree | 0e070fb6f11ab8763ac4f1f9a851a0061101d4d6 /OpenSim/Framework/WebUtil.cs | |
| parent | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff) | |
| parent | minor: commented out code removal (diff) | |
| download | opensim-SC-5693870fe26fae35a28f2d5103780434f4f40e57.zip opensim-SC-5693870fe26fae35a28f2d5103780434f4f40e57.tar.gz opensim-SC-5693870fe26fae35a28f2d5103780434f4f40e57.tar.bz2 opensim-SC-5693870fe26fae35a28f2d5103780434f4f40e57.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Framework/WebUtil.cs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/OpenSim/Framework/WebUtil.cs b/OpenSim/Framework/WebUtil.cs index 16e44af..2843e20 100644 --- a/OpenSim/Framework/WebUtil.cs +++ b/OpenSim/Framework/WebUtil.cs | |||
| @@ -263,8 +263,12 @@ namespace OpenSim.Framework | |||
| 263 | 263 | ||
| 264 | foreach (string key in parameters.Keys) | 264 | foreach (string key in parameters.Keys) |
| 265 | { | 265 | { |
| 266 | foreach (string value in parameters.GetValues(key)) | 266 | string[] values = parameters.GetValues(key); |
| 267 | items.Add(String.Concat(key, "=", HttpUtility.UrlEncode(value ?? String.Empty))); | 267 | if (values != null) |
| 268 | { | ||
| 269 | foreach (string value in values) | ||
| 270 | items.Add(String.Concat(key, "=", HttpUtility.UrlEncode(value ?? String.Empty))); | ||
| 271 | } | ||
| 268 | } | 272 | } |
| 269 | 273 | ||
| 270 | return String.Join("&", items.ToArray()); | 274 | return String.Join("&", items.ToArray()); |