1 files changed, 150 insertions, 114 deletions

diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs
index 131febd..de71b56 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs
@@ -31,13 +31,14 @@ using System.Net;
 using System.Reflection;
 using System.Xml;
 
-using OpenSim.Framework.Communications.Cache;
+
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Framework.Scenes.Hypergrid;
 using OpenSim.Services.Interfaces;
 using GridRegion = OpenSim.Services.Interfaces.GridRegion;
+using PresenceInfo = OpenSim.Services.Interfaces.PresenceInfo;
 using OpenSim.Server.Base;
 using OpenSim.Services.Connectors.Grid;
 using OpenSim.Framework.Console;
@@ -154,12 +155,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
 
             ((ISharedRegionModule)m_GridServiceConnector).AddRegion(scene);
 
-            // Yikes!! Remove this as soon as user services get refactored
-            LocalAssetServerURI = scene.CommsManager.NetworkServersInfo.AssetURL;
-            LocalInventoryServerURI = scene.CommsManager.NetworkServersInfo.InventoryURL;
-            LocalUserServerURI = scene.CommsManager.NetworkServersInfo.UserURL;
-            HGNetworkServersInfo.Init(LocalAssetServerURI, LocalInventoryServerURI, LocalUserServerURI);
-
         }
 
         public void RemoveRegion(Scene scene)
@@ -390,7 +385,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
 
         private static Random random = new Random();
 
-
+        // From the command line link-region
         public GridRegion TryLinkRegionToCoords(Scene m_scene, IClientAPI client, string mapName, int xloc, int yloc)
         {
             string host = "127.0.0.1";
@@ -446,6 +441,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
             return TryLinkRegionToCoords(m_scene, client, mapName, xloc, 0);
         }
 
+        // From the command line and the 2 above
         public bool TryCreateLink(Scene m_scene, IClientAPI client, int xloc, int yloc,
             string externalRegionName, uint externalPort, string externalHostName, out GridRegion regInfo)
         {
@@ -572,11 +568,13 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
             return true;
         }
 
+        // From the map search
         public GridRegion TryLinkRegion(IClientAPI client, string regionDescriptor)
         {
             return TryLinkRegion((Scene)client.Scene, client, regionDescriptor);
         }
 
+        // From the map and secondlife://blah
         public GridRegion GetHyperlinkRegion(ulong handle)
         {
             foreach (GridRegion r in m_HyperlinkRegions.Values)
@@ -603,93 +601,105 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
 
         public bool SendUserInformation(GridRegion regInfo, AgentCircuitData agentData)
         {
-            CachedUserInfo uinfo = m_aScene.CommsManager.UserProfileCacheService.GetUserDetails(agentData.AgentID);
-
-            if (uinfo == null)
-                return false;
+            // REFACTORING PROBLEM. This needs to change. Some of this info should go with the agent circuit data.
 
-            if ((IsLocalUser(uinfo) && (GetHyperlinkRegion(regInfo.RegionHandle) != null)) ||
-                (!IsLocalUser(uinfo) && !IsGoingHome(uinfo, regInfo)))
-            {
-                m_log.Info("[HGrid]: Local user is going to foreign region or foreign user is going elsewhere");
-
-                // Set the position of the region on the remote grid
-//                ulong realHandle = FindRegionHandle(regInfo.RegionHandle);
-                uint x = 0, y = 0;
-                Utils.LongToUInts(regInfo.RegionHandle, out x, out y);
-                GridRegion clonedRegion = new GridRegion(regInfo);
-                clonedRegion.RegionLocX = (int)x;
-                clonedRegion.RegionLocY = (int)y;
-
-                // Get the user's home region information and adapt the region handle
-                GridRegion home = GetRegionByUUID(m_aScene.RegionInfo.ScopeID, uinfo.UserProfile.HomeRegionID);
-                if (m_HyperlinkHandles.ContainsKey(uinfo.UserProfile.HomeRegionID))
-                {
-                    ulong realHandle = m_HyperlinkHandles[uinfo.UserProfile.HomeRegionID];
-                    Utils.LongToUInts(realHandle, out x, out y);
-                    m_log.DebugFormat("[HGrid]: Foreign user is going elsewhere. Adjusting home handle from {0}-{1} to {2}-{3}", home.RegionLocX, home.RegionLocY, x, y);
-                    home.RegionLocX = (int)x;
-                    home.RegionLocY = (int)y;
-                }
+            //UserAccount account = m_aScene.UserAccountService.GetUserAccount(m_aScene.RegionInfo.ScopeID, agentData.AgentID);
+            //if (account == null)
+            //    return false;
 
-                // Get the user's service URLs
-                string serverURI = "";
-                if (uinfo.UserProfile is ForeignUserProfileData)
-                    serverURI = Util.ServerURI(((ForeignUserProfileData)uinfo.UserProfile).UserServerURI);
-                string userServer = (serverURI == "") || (serverURI == null) ? LocalUserServerURI : serverURI;
-
-                string assetServer = Util.ServerURI(uinfo.UserProfile.UserAssetURI);
-                if ((assetServer == null) || (assetServer == ""))
-                    assetServer = LocalAssetServerURI;
-
-                string inventoryServer = Util.ServerURI(uinfo.UserProfile.UserInventoryURI);
-                if ((inventoryServer == null) || (inventoryServer == ""))
-                    inventoryServer = LocalInventoryServerURI;
-
-                if (!m_HypergridServiceConnector.InformRegionOfUser(clonedRegion, agentData, home, userServer, assetServer, inventoryServer))
-                {
-                    m_log.Warn("[HGrid]: Could not inform remote region of transferring user.");
-                    return false;
-                }
-            }
-            //if ((uinfo == null) || !IsGoingHome(uinfo, regInfo))
+            //if ((IsLocalUser(account) && (GetHyperlinkRegion(regInfo.RegionHandle) != null)) ||
+            //    (!IsLocalUser(account) && !IsGoingHome(uinfo, regInfo)))
             //{
-            //    m_log.Info("[HGrid]: User seems to be going to foreign region.");
-            //    if (!InformRegionOfUser(regInfo, agentData))
+            //    m_log.Info("[HGrid]: Local user is going to foreign region or foreign user is going elsewhere");
+
+            //    PresenceInfo pinfo = m_aScene.PresenceService.GetAgent(agentData.SessionID);
+            //    if (pinfo != null)
+            //    {
+            //        // Set the position of the region on the remote grid
+            //        //                ulong realHandle = FindRegionHandle(regInfo.RegionHandle);
+            //        uint x = 0, y = 0;
+            //        Utils.LongToUInts(regInfo.RegionHandle, out x, out y);
+            //        GridRegion clonedRegion = new GridRegion(regInfo);
+            //        clonedRegion.RegionLocX = (int)x;
+            //        clonedRegion.RegionLocY = (int)y;
+
+            //        // Get the user's home region information and adapt the region handle
+            //        GridRegion home = GetRegionByUUID(m_aScene.RegionInfo.ScopeID, pinfo.HomeRegionID);
+            //        if (m_HyperlinkHandles.ContainsKey(pinfo.HomeRegionID))
+            //        {
+            //            ulong realHandle = m_HyperlinkHandles[pinfo.HomeRegionID];
+            //            Utils.LongToUInts(realHandle, out x, out y);
+            //            m_log.DebugFormat("[HGrid]: Foreign user is going elsewhere. Adjusting home handle from {0}-{1} to {2}-{3}", home.RegionLocX, home.RegionLocY, x, y);
+            //            home.RegionLocX = (int)x;
+            //            home.RegionLocY = (int)y;
+            //        }
+
+            //        // Get the user's service URLs
+            //        string serverURI = "";
+            //        if (uinfo.UserProfile is ForeignUserProfileData)
+            //            serverURI = Util.ServerURI(((ForeignUserProfileData)uinfo.UserProfile).UserServerURI);
+            //        string userServer = (serverURI == "") || (serverURI == null) ? LocalUserServerURI : serverURI;
+
+            //        string assetServer = Util.ServerURI(uinfo.UserProfile.UserAssetURI);
+            //        if ((assetServer == null) || (assetServer == ""))
+            //            assetServer = LocalAssetServerURI;
+
+            //        string inventoryServer = Util.ServerURI(uinfo.UserProfile.UserInventoryURI);
+            //        if ((inventoryServer == null) || (inventoryServer == ""))
+            //            inventoryServer = LocalInventoryServerURI;
+
+            //        if (!m_HypergridServiceConnector.InformRegionOfUser(clonedRegion, agentData, home, userServer, assetServer, inventoryServer))
+            //        {
+            //            m_log.Warn("[HGrid]: Could not inform remote region of transferring user.");
+            //            return false;
+            //        }
+            //    }
+            //    else
             //    {
-            //        m_log.Warn("[HGrid]: Could not inform remote region of transferring user.");
+            //        m_log.Warn("[HGrid]: Unable to find local presence of transferring user.");
             //        return false;
             //    }
             //}
-            //else
-            //    m_log.Info("[HGrid]: User seems to be going home " + uinfo.UserProfile.FirstName + " " + uinfo.UserProfile.SurName);
-
-            // May need to change agent's name
-            if (IsLocalUser(uinfo) && (GetHyperlinkRegion(regInfo.RegionHandle) != null))
-            {
-                agentData.firstname = agentData.firstname + "." + agentData.lastname;
-                agentData.lastname = "@" + LocalUserServerURI.Replace("http://", ""); ; //HGNetworkServersInfo.Singleton.LocalUserServerURI;
-            }
+            ////if ((uinfo == null) || !IsGoingHome(uinfo, regInfo))
+            ////{
+            ////    m_log.Info("[HGrid]: User seems to be going to foreign region.");
+            ////    if (!InformRegionOfUser(regInfo, agentData))
+            ////    {
+            ////        m_log.Warn("[HGrid]: Could not inform remote region of transferring user.");
+            ////        return false;
+            ////    }
+            ////}
+            ////else
+            ////    m_log.Info("[HGrid]: User seems to be going home " + uinfo.UserProfile.FirstName + " " + uinfo.UserProfile.SurName);
+
+            //// May need to change agent's name
+            //if (IsLocalUser(uinfo) && (GetHyperlinkRegion(regInfo.RegionHandle) != null))
+            //{
+            //    agentData.firstname = agentData.firstname + "." + agentData.lastname;
+            //    agentData.lastname = "@" + LocalUserServerURI.Replace("http://", ""); ; //HGNetworkServersInfo.Singleton.LocalUserServerURI;
+            //}
 
             return true;
         }
 
         public void AdjustUserInformation(AgentCircuitData agentData)
         {
-            CachedUserInfo uinfo = m_aScene.CommsManager.UserProfileCacheService.GetUserDetails(agentData.AgentID);
-            if ((uinfo != null) && (uinfo.UserProfile != null) &&
-                (IsLocalUser(uinfo) || !(uinfo.UserProfile is ForeignUserProfileData)))
-            {
-                //m_log.Debug("---------------> Local User!");
-                string[] parts = agentData.firstname.Split(new char[] { '.' });
-                if (parts.Length == 2)
-                {
-                    agentData.firstname = parts[0];
-                    agentData.lastname = parts[1];
-                }
-            }
-            //else
-            //    m_log.Debug("---------------> Foreign User!");
+            // REFACTORING PROBLEM!!! This needs to change
+
+            //CachedUserInfo uinfo = m_aScene.CommsManager.UserProfileCacheService.GetUserDetails(agentData.AgentID);
+            //if ((uinfo != null) && (uinfo.UserProfile != null) &&
+            //    (IsLocalUser(uinfo) || !(uinfo.UserProfile is ForeignUserProfileData)))
+            //{
+            //    //m_log.Debug("---------------> Local User!");
+            //    string[] parts = agentData.firstname.Split(new char[] { '.' });
+            //    if (parts.Length == 2)
+            //    {
+            //        agentData.firstname = parts[0];
+            //        agentData.lastname = parts[1];
+            //    }
+            //}
+            ////else
+            ////    m_log.Debug("---------------> Foreign User!");
         }
 
         // Check if a local user exists with the same UUID as the incoming foreign user
@@ -697,16 +707,17 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
         {
             comingHome = false;
 
-            CachedUserInfo uinfo = m_aScene.CommsManager.UserProfileCacheService.GetUserDetails(userID);
-            if (uinfo != null) 
+            UserAccount account = m_aScene.UserAccountService.GetUserAccount(m_aScene.RegionInfo.ScopeID, userID);
+            if (account != null) 
             {
-                // uh-oh we have a potential intruder
-                if (uinfo.SessionID != sessionID)
-                    // can't have a foreigner with a local UUID
-                    return false;
-                else
+                if (m_aScene.AuthenticationService.Verify(userID, sessionID.ToString(), 30))
+                {
                     // oh, so it's you! welcome back
                     comingHome = true;
+                }
+                else
+                    // can't have a foreigner with a local UUID
+                    return false;
             }
 
             // OK, user can come in
@@ -715,7 +726,10 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
 
         public void AcceptUser(ForeignUserProfileData user, GridRegion home)
         {
-            m_aScene.CommsManager.UserProfileCacheService.PreloadUserCache(user);
+            // REFACTORING PROBLEM. uh-oh, commenting this breaks HG completely
+            // Needs to be rewritten
+            //m_aScene.CommsManager.UserProfileCacheService.PreloadUserCache(user);
+            
             ulong realHandle = home.RegionHandle;
             // Change the local coordinates
             // X=0 on the map
@@ -731,8 +745,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
 
         public bool IsLocalUser(UUID userID)
         {
-            CachedUserInfo uinfo = m_aScene.CommsManager.UserProfileCacheService.GetUserDetails(userID);
-            return IsLocalUser(uinfo);
+            UserAccount account = m_aScene.UserAccountService.GetUserAccount(m_aScene.RegionInfo.ScopeID, userID);
+            return IsLocalUser(account);
         }
 
         #endregion
@@ -741,37 +755,45 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
 
         protected bool IsComingHome(ForeignUserProfileData userData)
         {
-            return (userData.UserServerURI == LocalUserServerURI);
+            return false;
+            // REFACTORING PROBLEM
+            //return (userData.UserServerURI == LocalUserServerURI);
         }
 
-        // Is the user going back to the home region or the home grid?
-        protected bool IsGoingHome(CachedUserInfo uinfo, GridRegion rinfo)
-        {
-            if (uinfo == null)
-                return false;
+        // REFACTORING PROBLEM
+        //// Is the user going back to the home region or the home grid?
+        //protected bool IsGoingHome(CachedUserInfo uinfo, GridRegion rinfo)
+        //{
+        //    if (uinfo == null)
+        //        return false;
 
-            if (uinfo.UserProfile == null)
-                return false;
+        //    if (uinfo.UserProfile == null)
+        //        return false;
 
-            if (!(uinfo.UserProfile is ForeignUserProfileData))
-                // it's a home user, can't be outside to return home
-                return false;
+        //    if (!(uinfo.UserProfile is ForeignUserProfileData))
+        //        // it's a home user, can't be outside to return home
+        //        return false;
 
-            // OK, it's a foreign user with a ForeignUserProfileData
-            // and is going back to exactly the home region.
-            // We can't check if it's going back to a non-home region
-            // of the home grid. That will be dealt with in the
-            // receiving end
-            return (uinfo.UserProfile.HomeRegionID == rinfo.RegionID);
-        }
+        //    // OK, it's a foreign user with a ForeignUserProfileData
+        //    // and is going back to exactly the home region.
+        //    // We can't check if it's going back to a non-home region
+        //    // of the home grid. That will be dealt with in the
+        //    // receiving end
+        //    return (uinfo.UserProfile.HomeRegionID == rinfo.RegionID);
+        //}
 
-        protected bool IsLocalUser(CachedUserInfo uinfo)
+        protected bool IsLocalUser(UserAccount account)
         {
-            if (uinfo == null)
-                return false;
+            return true;
+
+            // REFACTORING PROBLEM
+            //if (account != null &&
+            //    account.ServiceURLs.ContainsKey("HomeURI") &&
+            //    account.ServiceURLs["HomeURI"] != null)
 
-            return !(uinfo.UserProfile is ForeignUserProfileData);
+            //    return (account.ServiceURLs["HomeURI"].ToString() == LocalUserServerURI);
 
+            //return false;
         }
 
 
@@ -806,6 +828,20 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
 
         #endregion
 
+        public List<GridRegion> GetDefaultRegions(UUID scopeID)
+        {
+            return null;
+        }
+
+        public List<GridRegion> GetFallbackRegions(UUID scopeID, int x, int y)
+        {
+            return null;
+        }
+
+        public int GetRegionFlags(UUID scopeID, UUID regionID)
+        {
+            return 0;
+        }
 
     }
 }