* All modules and connectors for user account service are in place. Untested.

* Cleaned up a few things on presence connectors

1 files changed, 47 insertions, 47 deletions

diff --git a/OpenSim/Services/Connectors/User/UserServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccount/RemoteUserAccountServiceConnector.cs
index 0de8c1d..0b72080 100644
--- a/OpenSim/Services/Connectors/User/UserServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccount/RemoteUserAccountServiceConnector.cs
@@ -25,90 +25,90 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using log4net;
 using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Reflection;
 using Nini.Config;
-using OpenSim.Framework;
-using OpenSim.Framework.Communications;
-using OpenSim.Framework.Servers.HttpServer;
+using log4net;
+using System.Reflection;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
 using OpenSim.Services.Interfaces;
-using OpenMetaverse;
+using OpenSim.Services.Connectors;
 
-namespace OpenSim.Services.Connectors
+namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.User
 {
-    public class UserServicesConnector : IUserAccountService
+    public class RemoteUserAccountServicesConnector : UserAccountServicesConnector,
+            ISharedRegionModule, IUserAccountService
     {
         private static readonly ILog m_log =
                 LogManager.GetLogger(
                 MethodBase.GetCurrentMethod().DeclaringType);
 
-//        private string m_ServerURI = String.Empty;
-
-        public UserServicesConnector()
-        {
-        }
+        private bool m_Enabled = false;
 
-        public UserServicesConnector(string serverURI)
+        public Type ReplaceableInterface 
         {
-//            m_ServerURI = serverURI.TrimEnd('/');
+            get { return null; }
         }
 
-        public UserServicesConnector(IConfigSource source)
+        public string Name
         {
-            Initialise(source);
+            get { return "RemoteUserAccountServicesConnector"; }
         }
 
-        public virtual void Initialise(IConfigSource source)
+        public override void Initialise(IConfigSource source)
         {
-            IConfig assetConfig = source.Configs["UserService"];
-            if (assetConfig == null)
+            IConfig moduleConfig = source.Configs["Modules"];
+            if (moduleConfig != null)
             {
-                m_log.Error("[USER CONNECTOR]: UserService missing from OpanSim.ini");
-                throw new Exception("User connector init error");
-            }
+                string name = moduleConfig.GetString("UserServices", "");
+                if (name == Name)
+                {
+                    IConfig userConfig = source.Configs["UserService"];
+                    if (userConfig == null)
+                    {
+                        m_log.Error("[USER CONNECTOR]: UserService missing from OpanSim.ini");
+                        return;
+                    }
 
-            string serviceURI = assetConfig.GetString("UserServerURI",
-                    String.Empty);
+                    m_Enabled = true;
 
-            if (serviceURI == String.Empty)
-            {
-                m_log.Error("[USER CONNECTOR]: No Server URI named in section UserService");
-                throw new Exception("User connector init error");
+                    base.Initialise(source);
+
+                    m_log.Info("[USER CONNECTOR]: Remote users enabled");
+                }
             }
-            //m_ServerURI = serviceURI;
         }
 
-        public UserAccount GetUserAccount(UUID scopeID, string firstName, string lastName)
+        public void PostInitialise()
         {
-            return null;
+            if (!m_Enabled)
+                return;
         }
 
-        public UserAccount GetUserAccount(UUID scopeID, string email)
+        public void Close()
         {
-            return null;
-        }
-        
-        public UserAccount GetUserAccount(UUID scopeID, UUID userID)
-        {
-            return null;
+            if (!m_Enabled)
+                return;
         }
 
-        public bool SetUserAccount(UserAccount data)
+        public void AddRegion(Scene scene)
         {
-            return false;
+            if (!m_Enabled)
+                return;
+
+            scene.RegisterModuleInterface<IUserAccountService>(this);
         }
 
-        public bool CreateUserAccount(UserAccount data)
+        public void RemoveRegion(Scene scene)
         {
-            return false;
+            if (!m_Enabled)
+                return;
         }
 
-        public List<UserAccount> GetUserAccounts(UUID scopeID, string query)
+        public void RegionLoaded(Scene scene)
         {
-            return null;
+            if (!m_Enabled)
+                return;
         }
     }
 }