From 4565e5dfbccace2698b262c2b73a12b789c4853b Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 26 Mar 2010 18:56:05 +0000
Subject: change trunk version to 0.7.Dev

---
 OpenSim/Framework/Servers/VersionInfo.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Framework')

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
 {
     public class VersionInfo
     {
-        private const string VERSION_NUMBER = "0.6.9";
+        private const string VERSION_NUMBER = "0.7";
         private const Flavour VERSION_FLAVOUR = Flavour.Dev;
 
         public enum Flavour
@@ -71,4 +71,4 @@ namespace OpenSim
         /// </value>
         public readonly static int MajorInterfaceVersion = 6;
     }
-}
+}
\ No newline at end of file
-- 
cgit v1.1


From 5a2315c68c7ccac2fafeb7e2cd51ecda863a9fa7 Mon Sep 17 00:00:00 2001
From: John Hurliman
Date: Fri, 26 Mar 2010 12:21:05 -0700
Subject: * 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

---
 OpenSim/Framework/WebUtil.cs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Framework')

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
 
             foreach (string key in parameters.Keys)
             {
-                foreach (string value in parameters.GetValues(key))
-                    items.Add(String.Concat(key, "=", HttpUtility.UrlEncode(value ?? String.Empty)));
+                string[] values = parameters.GetValues(key);
+                if (values != null)
+                {
+                    foreach (string value in values)
+                        items.Add(String.Concat(key, "=", HttpUtility.UrlEncode(value ?? String.Empty)));
+                }
             }
 
             return String.Join("&", items.ToArray());
-- 
cgit v1.1