1 files changed, 46 insertions, 7 deletions

diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/User/LocalUserServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs
index cca5bb4..f55de5a 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/User/LocalUserServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs
@@ -26,6 +26,7 @@
  */
 
 using System;
+using System.Collections.Generic;
 using System.Reflection;
 using log4net;
 using Nini.Config;
@@ -34,9 +35,11 @@ using OpenSim.Region.Framework.Scenes;
 using OpenSim.Server.Base;
 using OpenSim.Services.Interfaces;
 
-namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.User
+using OpenMetaverse;
+
+namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts
 {
-    public class LocalUserServicesConnector : ISharedRegionModule
+    public class LocalUserAccountServicesConnector : ISharedRegionModule, IUserAccountService
     {
         private static readonly ILog m_log =
                 LogManager.GetLogger(
@@ -46,6 +49,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.User
 
         private bool m_Enabled = false;
 
+        #region ISharedRegionModule
+
         public Type ReplaceableInterface 
         {
             get { return null; }
@@ -53,7 +58,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.User
 
         public string Name
         {
-            get { return "LocalUserServicesConnector"; }
+            get { return "LocalUserAccountServicesConnector"; }
         }
 
         public void Initialise(IConfigSource source)
@@ -61,13 +66,13 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.User
             IConfig moduleConfig = source.Configs["Modules"];
             if (moduleConfig != null)
             {
-                string name = moduleConfig.GetString("UserServices", "");
+                string name = moduleConfig.GetString("UserAccountServices", "");
                 if (name == Name)
                 {
-                    IConfig userConfig = source.Configs["UserService"];
+                    IConfig userConfig = source.Configs["UserAccountService"];
                     if (userConfig == null)
                     {
-                        m_log.Error("[USER CONNECTOR]: UserService missing from OpenSim.ini");
+                        m_log.Error("[USER CONNECTOR]: UserAccountService missing from OpenSim.ini");
                         return;
                     }
 
@@ -87,7 +92,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.User
 
                     if (m_UserService == null)
                     {
-                        m_log.Error("[USER CONNECTOR]: Can't load user service");
+                        m_log.Error("[USER CONNECTOR]: Can't load user account service");
                         return;
                     }
                     m_Enabled = true;
@@ -127,5 +132,39 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.User
             if (!m_Enabled)
                 return;
         }
+
+        #endregion
+
+        #region IUserAccountService
+
+        public UserAccount GetUserAccount(UUID scopeID, UUID userID)
+        {
+            return m_UserService.GetUserAccount(scopeID, userID);
+        }
+
+        public UserAccount GetUserAccount(UUID scopeID, string FirstName, string LastName)
+        {
+            return m_UserService.GetUserAccount(scopeID, FirstName, LastName);
+        }
+
+        public UserAccount GetUserAccount(UUID scopeID, string Email)
+        {
+            return m_UserService.GetUserAccount(scopeID, Email);
+        }
+
+        public List<UserAccount> GetUserAccounts(UUID scopeID, string query)
+        {
+            return m_UserService.GetUserAccounts(scopeID, query);
+        }
+
+        // Update all updatable fields
+        //
+        public bool StoreUserAccount(UserAccount data)
+        {
+            return m_UserService.StoreUserAccount(data);
+        }
+
+        #endregion
+
     }
 }