aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-03-26 19:34:49 +0000
committerJustin Clark-Casey (justincc)2010-03-26 19:34:49 +0000
commitfc2b1375810ca263242475263428ca676f3fe014 (patch)
treeebfb48904ac1fa80f3a7d9845997c9abe8d2ff5c /OpenSim/Framework
parentcomment out very probably unused dist and distdir nant targets (diff)
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-fc2b1375810ca263242475263428ca676f3fe014.zip
opensim-SC_OLD-fc2b1375810ca263242475263428ca676f3fe014.tar.gz
opensim-SC_OLD-fc2b1375810ca263242475263428ca676f3fe014.tar.bz2
opensim-SC_OLD-fc2b1375810ca263242475263428ca676f3fe014.tar.xz
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/WebUtil.cs8
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());