diff options
author | John Hurliman | 2010-03-26 12:21:05 -0700 |
---|---|---|
committer | John Hurliman | 2010-03-26 12:21:05 -0700 |
commit | 5a2315c68c7ccac2fafeb7e2cd51ecda863a9fa7 (patch) | |
tree | e42b1104ade22fdb4dfb2129aad45f908f5a3044 /OpenSim/Framework | |
parent | Fixed a backwards null check that was preventing estate owner from being set ... (diff) | |
download | opensim-SC_OLD-5a2315c68c7ccac2fafeb7e2cd51ecda863a9fa7.zip opensim-SC_OLD-5a2315c68c7ccac2fafeb7e2cd51ecda863a9fa7.tar.gz opensim-SC_OLD-5a2315c68c7ccac2fafeb7e2cd51ecda863a9fa7.tar.bz2 opensim-SC_OLD-5a2315c68c7ccac2fafeb7e2cd51ecda863a9fa7.tar.xz |
* Fixed a bug with null value handling in WebUtil.BuildQueryString()
* Changed the null check back in estate manager setup but fixed the case for an existing account being found
* Implemented SetPassword() in the SimianGrid auth connector
Diffstat (limited to 'OpenSim/Framework')
-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()); |