* Fission OGS1UserServices into user service and OGS1 user data plugin components

* Make OGS1UserServices inherit from UserManagerBase
* This allows grid mode regions to use the same user data plugin infrastructure as grid servers and standalone OpenSims

2 files changed, 9 insertions, 35 deletions

diff --git a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs
index 2ef0fd3..1268237 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsGridMode.cs
@@ -31,6 +31,7 @@ using OpenSim.Framework;
 using OpenSim.Framework.Communications;
 using OpenSim.Framework.Communications.Cache;
 using OpenSim.Framework.Servers;
+using OpenSim.Region.Communications.OGS1;
 using OpenSim.Region.Framework.Scenes;
 
 namespace OpenSim.Region.Communications.Hypergrid
@@ -51,7 +52,6 @@ namespace OpenSim.Region.Communications.Hypergrid
             IAssetCache assetCache, SceneManager sman, LibraryRootFolder libraryRootFolder)
             : base(serversInfo, httpServer, assetCache, false, libraryRootFolder)
         {
-
             // From constructor at CommunicationsOGS1
             HGGridServices gridInterComms = new HGGridServicesGridMode(serversInfo, httpServer, assetCache, sman, m_userProfileCacheService);
             m_gridService = gridInterComms;
@@ -63,12 +63,15 @@ namespace OpenSim.Region.Communications.Hypergrid
             AddSecureInventoryService(invService);
             m_defaultInventoryHost = invService.Host;
             if (SecureInventoryService != null)
-                m_log.Info("[HG] SecureInventoryService.");
+                m_log.Info("[HG]: SecureInventoryService.");
             else
-                m_log.Info("[HG] Non-secureInventoryService.");
-
+                m_log.Info("[HG]: Non-secureInventoryService.");
 
             HGUserServices userServices = new HGUserServices(this);
+            // This plugin arrangement could eventually be configurable rather than hardcoded here.           
+            OGS1UserDataPlugin userDataPlugin = new OGS1UserDataPlugin(this);
+            userServices.AddPlugin(userDataPlugin);            
+            
             m_userService = userServices;
             m_messageService = userServices;
             m_avatarService = (IAvatarService)m_userService;
diff --git a/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs b/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs
index 370ef12..357d8a6 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs
@@ -59,6 +59,7 @@ namespace OpenSim.Region.Communications.Hypergrid
 
         // Constructor called when running in standalone
         public HGUserServices(LocalUserServices local)
+            : base(null)
         {
             m_localUserServices = local;
         }
@@ -101,30 +102,12 @@ namespace OpenSim.Region.Communications.Hypergrid
                 base.LogOffUser(userid, regionid, regionhandle, position, lookat);
         }
 
-        /// <summary>
-        /// Logs off a user on the user server (deprecated as of 2008-08-27)
-        /// </summary>
-        /// <param name="UserID">UUID of the user</param>
-        /// <param name="regionID">UUID of the Region</param>
-        /// <param name="regionhandle">regionhandle</param>
-        /// <param name="posx">final position x</param>
-        /// <param name="posy">final position y</param>
-        /// <param name="posz">final position z</param>
-        public override void LogOffUser(UUID userid, UUID regionid, ulong regionhandle, float posx, float posy, float posz)
-        {
-            string url = string.Empty;
-            if ((m_localUserServices != null) && !IsForeignUser(userid, out url))
-                m_localUserServices.LogOffUser(userid, regionid, regionhandle, posx, posy, posz);
-            else
-                base.LogOffUser(userid, regionid, regionhandle, posx, posy, posz);
-        }
-
         public override UserProfileData GetUserProfile(string firstName, string lastName)
         {
             if (m_localUserServices != null)
                 return m_localUserServices.GetUserProfile(firstName, lastName);
 
-            return GetUserProfile(firstName + " " + lastName);
+            return base.GetUserProfile(firstName, lastName);
         }
 
         public override List<AvatarPickerAvatar> GenerateAgentPickerRequestResponse(UUID queryID, string query)
@@ -140,18 +123,6 @@ namespace OpenSim.Region.Communications.Hypergrid
         /// </summary>
         /// <param name="avatarID"></param>
         /// <returns>null if the request fails</returns>
-        public override UserProfileData GetUserProfile(string name)
-        {
-            // This doesn't exist in LocalUserServices
-
-            return base.GetUserProfile(name);
-        }
-
-        /// <summary>
-        /// Get a user profile from the user server
-        /// </summary>
-        /// <param name="avatarID"></param>
-        /// <returns>null if the request fails</returns>
         public override UserProfileData GetUserProfile(UUID avatarID)
         {
             //string url = string.Empty;