Attempt at fixing the HG home jump by looking up hyperlink regions before grid-local regions.

2 files changed, 3 insertions, 3 deletions

diff --git a/OpenSim/Region/Communications/Hypergrid/HGGridServicesGridMode.cs b/OpenSim/Region/Communications/Hypergrid/HGGridServicesGridMode.cs
index a29edb4..f45c484 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGGridServicesGridMode.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGGridServicesGridMode.cs
@@ -121,9 +121,9 @@ namespace OpenSim.Region.Communications.Hypergrid
 
         public override RegionInfo RequestNeighbourInfo(ulong regionHandle)
         {
-            RegionInfo info = m_remoteBackend.RequestNeighbourInfo(regionHandle);
+            RegionInfo info = base.RequestNeighbourInfo(regionHandle);
             if (info == null)
-                info = base.RequestNeighbourInfo(regionHandle);
+                info = m_remoteBackend.RequestNeighbourInfo(regionHandle);
             return info;
         }
 
diff --git a/OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs b/OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs
index 595ac09..1b3f008 100644
--- a/OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs
+++ b/OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs
@@ -283,7 +283,7 @@ namespace OpenSim.Region.Environment.Scenes.Hypergrid
                         // if (teleport success) // seems to be always success here
                         // the user may change their profile information in other region,
                         // so the userinfo in UserProfileCache is not reliable any more, delete it
-                        if (avatar.Scene.NeedSceneCacheClear(avatar.UUID))
+                        if (avatar.Scene.NeedSceneCacheClear(avatar.UUID) || isHyperLink)
                         {
                             m_commsProvider.UserProfileCacheService.RemoveUser(avatar.UUID);
                             m_log.InfoFormat("[HGSceneCommService]: User {0} is going to another region, profile cache removed", avatar.UUID);