Merge branch 'presence-refactor' of ssh://opensimulator.org/var/git/opensim into presence-refactor

7 files changed, 55 insertions, 42 deletions

diff --git a/OpenSim/Services/AssetService/AssetService.cs b/OpenSim/Services/AssetService/AssetService.cs
index a91b632..b9723a8 100644
--- a/OpenSim/Services/AssetService/AssetService.cs
+++ b/OpenSim/Services/AssetService/AssetService.cs
@@ -81,12 +81,12 @@ namespace OpenSim.Services.AssetService
         }
 
         public AssetBase Get(string id)
-        {                        
+        {
             UUID assetID;
 
             if (!UUID.TryParse(id, out assetID))
             {
-                m_log.WarnFormat("[ASSET SERVICE]: Could not parse requested sset id {0}", id);                
+                m_log.WarnFormat("[ASSET SERVICE]: Could not parse requested sset id {0}", id);
                 return null;
             }
 
diff --git a/OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs b/OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs
index f6dd085..9af61a9 100644
--- a/OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs
+++ b/OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs
@@ -106,12 +106,17 @@ namespace OpenSim.Services.AuthenticationService
             string passwordSalt = Util.Md5Hash(UUID.Random().ToString());
             string md5PasswdHash = Util.Md5Hash(Util.Md5Hash(password) + ":" + passwordSalt);
 
-            AuthenticationData auth = new AuthenticationData();
-            auth.PrincipalID = principalID;
-            auth.Data = new System.Collections.Generic.Dictionary<string, object>();
+            AuthenticationData auth = m_Database.Get(principalID);
+            if (auth == null)
+            {
+                auth = new AuthenticationData();
+                auth.PrincipalID = principalID;
+                auth.Data = new System.Collections.Generic.Dictionary<string, object>();
+                auth.Data["accountType"] = "UserAccount";
+                auth.Data["webLoginKey"] = UUID.Zero.ToString();
+            }
             auth.Data["passwordHash"] = md5PasswdHash;
             auth.Data["passwordSalt"] = passwordSalt;
-            auth.Data["webLoginKey"] = UUID.Zero.ToString();
             if (!m_Database.Store(auth))
             {
                 m_log.DebugFormat("[AUTHENTICATION DB]: Failed to store authentication data");
diff --git a/OpenSim/Services/Base/ServiceBase.cs b/OpenSim/Services/Base/ServiceBase.cs
index 6bbe978..8e24d85 100644
--- a/OpenSim/Services/Base/ServiceBase.cs
+++ b/OpenSim/Services/Base/ServiceBase.cs
@@ -64,7 +64,7 @@ namespace OpenSim.Services.Base
                 foreach (Type pluginType in pluginAssembly.GetTypes())
                 {
                     if (pluginType.IsPublic)
-                    {
+                    {                        
                         if (className != String.Empty &&
                                 pluginType.ToString() !=
                                 pluginType.Namespace + "." + className)
@@ -84,8 +84,9 @@ namespace OpenSim.Services.Base
 
                 return null;
             }
-            catch (Exception)
+            catch (Exception e)
             {
+                Console.WriteLine("XXX Exception " + e.StackTrace);
                 return null;
             }
         }
diff --git a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
index 876e7ed..966af0b 100644
--- a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
@@ -93,7 +93,7 @@ namespace OpenSim.Services.Connectors
         }
 
         public AssetBase Get(string id)
-        {            
+        {
             string uri = m_ServerURI + "/assets/" + id;
 
             AssetBase asset = null;
diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs
index 4dee7a4..1368e46 100644
--- a/OpenSim/Services/GridService/GridService.cs
+++ b/OpenSim/Services/GridService/GridService.cs
@@ -82,20 +82,22 @@ namespace OpenSim.Services.GridService
             {
                 m_RootInstance = this;
 
-                MainConsole.Instance.Commands.AddCommand("grid", true,
-                        "show region",
-                        "show region <Region name>",
-                        "Show details on a region",
-                        String.Empty,
-                        HandleShowRegion);
-
-                MainConsole.Instance.Commands.AddCommand("grid", true,
-                        "set region flags",
-                        "set region flags <Region name> <flags>",
-                        "Set database flags for region",
-                        String.Empty,
-                        HandleSetFlags);
-
+                if (MainConsole.Instance != null)
+                {
+                    MainConsole.Instance.Commands.AddCommand("grid", true,
+                            "show region",
+                            "show region <Region name>",
+                            "Show details on a region",
+                            String.Empty,
+                            HandleShowRegion);
+
+                    MainConsole.Instance.Commands.AddCommand("grid", true,
+                            "set region flags",
+                            "set region flags <Region name> <flags>",
+                            "Set database flags for region",
+                            String.Empty,
+                            HandleSetFlags);
+                }
                 m_HypergridLinker = new HypergridLinker(m_config, this, m_Database);
             }
         }
diff --git a/OpenSim/Services/GridService/HypergridLinker.cs b/OpenSim/Services/GridService/HypergridLinker.cs
index 18d0586..de5df9d 100644
--- a/OpenSim/Services/GridService/HypergridLinker.cs
+++ b/OpenSim/Services/GridService/HypergridLinker.cs
@@ -113,18 +113,20 @@ namespace OpenSim.Services.GridService
 
                 m_log.DebugFormat("[HYPERGRID LINKER]: Loaded all services...");
             }
-            
-
-            MainConsole.Instance.Commands.AddCommand("hypergrid", false, "link-region",
-                "link-region <Xloc> <Yloc> <HostName>:<HttpPort>[:<RemoteRegionName>] <cr>",
-                "Link a hypergrid region", RunCommand);
-            MainConsole.Instance.Commands.AddCommand("hypergrid", false, "unlink-region",
-                "unlink-region <local name> or <HostName>:<HttpPort> <cr>",
-                "Unlink a hypergrid region", RunCommand);
-            MainConsole.Instance.Commands.AddCommand("hypergrid", false, "link-mapping", "link-mapping [<x> <y>] <cr>",
-                "Set local coordinate to map HG regions to", RunCommand);
-            MainConsole.Instance.Commands.AddCommand("hypergrid", false, "show hyperlinks", "show hyperlinks <cr>",
-                "List the HG regions", HandleShow);
+
+            if (MainConsole.Instance != null)
+            {
+                MainConsole.Instance.Commands.AddCommand("hypergrid", false, "link-region",
+                    "link-region <Xloc> <Yloc> <HostName>:<HttpPort>[:<RemoteRegionName>] <cr>",
+                    "Link a hypergrid region", RunCommand);
+                MainConsole.Instance.Commands.AddCommand("hypergrid", false, "unlink-region",
+                    "unlink-region <local name> or <HostName>:<HttpPort> <cr>",
+                    "Unlink a hypergrid region", RunCommand);
+                MainConsole.Instance.Commands.AddCommand("hypergrid", false, "link-mapping", "link-mapping [<x> <y>] <cr>",
+                    "Set local coordinate to map HG regions to", RunCommand);
+                MainConsole.Instance.Commands.AddCommand("hypergrid", false, "show hyperlinks", "show hyperlinks <cr>",
+                    "List the HG regions", HandleShow);
+            }
         }
 
 
diff --git a/OpenSim/Services/UserAccountService/UserAccountService.cs b/OpenSim/Services/UserAccountService/UserAccountService.cs
index ffb9cca..e498bd5 100644
--- a/OpenSim/Services/UserAccountService/UserAccountService.cs
+++ b/OpenSim/Services/UserAccountService/UserAccountService.cs
@@ -77,13 +77,16 @@ namespace OpenSim.Services.UserAccountService
                 if (invServiceDll != string.Empty)
                     m_InventoryService = LoadPlugin<IInventoryService>(invServiceDll, new Object[] { config });
 
-                MainConsole.Instance.Commands.AddCommand("UserService", false,
-                        "create user",
-                        "create user [<first> [<last> [<pass> [<email>]]]]",
-                        "Create a new user", HandleCreateUser);
-                MainConsole.Instance.Commands.AddCommand("UserService", false, "reset user password",
-                        "reset user password [<first> [<last> [<password>]]]",
-                        "Reset a user password", HandleResetUserPassword);
+                if (MainConsole.Instance != null)
+                {
+                    MainConsole.Instance.Commands.AddCommand("UserService", false,
+                            "create user",
+                            "create user [<first> [<last> [<pass> [<email>]]]]",
+                            "Create a new user", HandleCreateUser);
+                    MainConsole.Instance.Commands.AddCommand("UserService", false, "reset user password",
+                            "reset user password [<first> [<last> [<password>]]]",
+                            "Reset a user password", HandleResetUserPassword);
+                }
 
             }