diff options
| author | Diva Canto | 2010-03-26 13:14:32 -0700 |
|---|---|---|
| committer | Diva Canto | 2010-03-26 13:14:32 -0700 |
| commit | c6bbb48f2b83bbb6baa1f1fd38e78f9030d5773a (patch) | |
| tree | c15d71e4d53e9a7d819c9f8494a7fc3904d4e73f /OpenSim/Framework/WebUtil.cs | |
| parent | Hippos with bin/Newtonsoft.Json.XML (diff) | |
| parent | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-c6bbb48f2b83bbb6baa1f1fd38e78f9030d5773a.zip opensim-SC_OLD-c6bbb48f2b83bbb6baa1f1fd38e78f9030d5773a.tar.gz opensim-SC_OLD-c6bbb48f2b83bbb6baa1f1fd38e78f9030d5773a.tar.bz2 opensim-SC_OLD-c6bbb48f2b83bbb6baa1f1fd38e78f9030d5773a.tar.xz | |
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Framework/WebUtil.cs')
| -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()); |