Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim

.nant/local.include

@@ -1,8 +1,23 @@
 <!-- -*- xml -*- -->
 <!-- please leave the top comment for us emacs folks -->
-<property name="projectdir" value="opensim-0.5.5" />
 <property name="nunitcmd" value="nunit-console" />
 
+<!-- I don't think these targets are being actively used.  But just in case, we'll just comment them out for now - justincc -->
+<!--
+<property name="projectdir" value="opensim-0.6.9" />
+<target name="dist" depends="distdir">
+    <zip zipfile="${projectdir}.zip">
+    <fileset basedir=".">
+        <include name="${projectdir}/**" />
+    </fileset>
+    </zip>
+    <tar destfile="${projectdir}.tar.gz" compression="GZip">
+    <fileset basedir=".">
+        <include name="${projectdir}/**" />
+    </fileset>
+    </tar>
+</target>
+
 <target name="distdir">
    <delete dir="${projectdir}" />
    <copy todir="${projectdir}">
@@ -21,14 +36,14 @@
           <include name="bin/assets/**" />
           <include name="bin/data/**" />
           <include name="bin/OpenSim*xml" />
-          <!-- the next is to exclude built libs -->
-          <exclude name="bin/OpenSim.*dll" />
           <include name="bin/OpenSim.ini" />
           <include name="bin/defaultstripe.png" />
+          <exclude name="bin/OpenSim.*dll" />
        </fileset>
    </copy>
    <touch file="${projectdir}/bin/startup_commands.txt" />
 </target>
+-->
 
 <target name="test" depends="build, find-nunit">
   <setenv name="MONO_THREADS_PER_CPU" value="100" />
@@ -296,17 +311,3 @@
 <target name="doxygen">
   <exec program="doxygen" workingdir="doc" commandline="doxygen.conf" />
 </target>
-
-
-<target name="dist" depends="distdir">
-    <zip zipfile="${projectdir}.zip">
-    <fileset basedir=".">
-        <include name="${projectdir}/**" />
-    </fileset>
-    </zip>
-    <tar destfile="${projectdir}.tar.gz" compression="GZip">
-    <fileset basedir=".">
-        <include name="${projectdir}/**" />
-    </fileset>
-    </tar>
-</target>

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

OpenSim/Framework/WebUtil.cs

@@ -263,9 +263,13 @@ namespace OpenSim.Framework
 
             foreach (string key in parameters.Keys)
             {
-                foreach (string value in parameters.GetValues(key))
+                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());
         }

OpenSim/Region/Framework/Scenes/Scene.cs

@@ -1266,8 +1266,9 @@ namespace OpenSim.Region.Framework.Scenes
 
                 UserAccount account = UserAccountService.GetUserAccount(m_regInfo.ScopeID, first, last);
 
-                if (account != null)
+                if (account == null)
                 {
+                    // Create a new account
                     account = new UserAccount(m_regInfo.ScopeID, first, last, String.Empty);
                     if (account.ServiceURLs == null || (account.ServiceURLs != null && account.ServiceURLs.Count == 0))
                     {
@@ -1325,7 +1326,8 @@ namespace OpenSim.Region.Framework.Scenes
                 }
                 else
                 {
-                    MainConsole.Instance.Output("User account not found. Please enter the name of an existing user");
+                    m_regInfo.EstateSettings.EstateOwner = account.PrincipalID;
+                    m_regInfo.EstateSettings.Save();
                 }
             }
         }

OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs

@@ -1193,8 +1193,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                     else
                     {
                         string domain = string.Empty; //m_sceneList[0].CommsManager.NetworkServersInfo.UserURL;
-                        if (account.ServiceURLs["HomeURI"] != null)
+                        object homeUriObj;
-                            domain = account.ServiceURLs["HomeURI"].ToString();
+                        if (account.ServiceURLs.TryGetValue("HomeURI", out homeUriObj) && homeUriObj != null)
+                            domain = homeUriObj.ToString();
                         // They're a local user, use this:
                         info.RequestID.UserServiceURL = domain;
                     }

OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs

@@ -177,9 +177,46 @@ namespace OpenSim.Services.Connectors.SimianGrid
 
         public bool SetPassword(UUID principalID, string passwd)
         {
-            // TODO: Use GetIdentities to find the md5hash identity for principalID
+            // Fetch the user name first
-            // and then update it with AddIdentity
+            NameValueCollection requestArgs = new NameValueCollection
-            m_log.Error("[AUTH CONNECTOR]: Changing passwords is not implemented yet");
+            {
+                { "RequestMethod", "GetUser" },
+                { "UserID", principalID.ToString() }
+            };
+
+            OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs);
+            if (response["Success"].AsBoolean() && response["User"] is OSDMap)
+            {
+                OSDMap userMap = (OSDMap)response["User"];
+                string identifier = userMap["Name"].AsString();
+
+                if (!String.IsNullOrEmpty(identifier))
+                {
+                    // Add/update the md5hash identity
+                    requestArgs = new NameValueCollection
+                    {
+                        { "RequestMethod", "AddIdentity" },
+                        { "Identifier", identifier },
+                        { "Credential", "$1$" + Utils.MD5String(passwd) },
+                        { "Type", "md5hash" },
+                        { "UserID", principalID.ToString() }
+                    };
+
+                    response = WebUtil.PostToService(m_serverUrl, requestArgs);
+                    bool success = response["Success"].AsBoolean();
+
+                    if (!success)
+                        m_log.WarnFormat("[AUTH CONNECTOR]: Failed to set password for {0} ({1})", identifier, principalID);
+
+                    return success;
+                }
+            }
+            else
+            {
+                m_log.Warn("[AUTH CONNECTOR]: Failed to retrieve identities for " + principalID + ": " +
+                    response["Message"].AsString());
+            }
+
             return false;
         }