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 | |
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 '')
-rw-r--r-- | OpenSim/Framework/Servers/VersionInfo.cs | 4 | ||||
-rw-r--r-- | OpenSim/Framework/WebUtil.cs | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/OpenSim/Framework/Servers/VersionInfo.cs b/OpenSim/Framework/Servers/VersionInfo.cs index ec94b2d..90b5f57 100644 --- a/OpenSim/Framework/Servers/VersionInfo.cs +++ b/OpenSim/Framework/Servers/VersionInfo.cs | |||
@@ -29,7 +29,7 @@ namespace OpenSim | |||
29 | { | 29 | { |
30 | public class VersionInfo | 30 | public class VersionInfo |
31 | { | 31 | { |
32 | private const string VERSION_NUMBER = "0.6.9"; | 32 | private const string VERSION_NUMBER = "0.7"; |
33 | private const Flavour VERSION_FLAVOUR = Flavour.Dev; | 33 | private const Flavour VERSION_FLAVOUR = Flavour.Dev; |
34 | 34 | ||
35 | public enum Flavour | 35 | public enum Flavour |
@@ -71,4 +71,4 @@ namespace OpenSim | |||
71 | /// </value> | 71 | /// </value> |
72 | public readonly static int MajorInterfaceVersion = 6; | 72 | public readonly static int MajorInterfaceVersion = 6; |
73 | } | 73 | } |
74 | } | 74 | } \ No newline at end of file |
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()); |