aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authordiva2008-12-15 22:17:40 +0000
committerdiva2008-12-15 22:17:40 +0000
commit223b6f63af2b30ebd046b95f36c8aae34b59778a (patch)
tree88b58fb5beac331dcfb5557152d186e0e45ad6f1 /OpenSim
parentMore work on moving Xfer file transfer handling code to the Client stack from... (diff)
downloadopensim-SC_OLD-223b6f63af2b30ebd046b95f36c8aae34b59778a.zip
opensim-SC_OLD-223b6f63af2b30ebd046b95f36c8aae34b59778a.tar.gz
opensim-SC_OLD-223b6f63af2b30ebd046b95f36c8aae34b59778a.tar.bz2
opensim-SC_OLD-223b6f63af2b30ebd046b95f36c8aae34b59778a.tar.xz
Attempt at fixing the HG home jump by looking up hyperlink regions before grid-local regions.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Communications/Hypergrid/HGGridServicesGridMode.cs4
-rw-r--r--OpenSim/Region/Environment/Scenes/Hypergrid/HGSceneCommunicationService.cs2
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
121 121
122 public override RegionInfo RequestNeighbourInfo(ulong regionHandle) 122 public override RegionInfo RequestNeighbourInfo(ulong regionHandle)
123 { 123 {
124 RegionInfo info = m_remoteBackend.RequestNeighbourInfo(regionHandle); 124 RegionInfo info = base.RequestNeighbourInfo(regionHandle);
125 if (info == null) 125 if (info == null)
126 info = base.RequestNeighbourInfo(regionHandle); 126 info = m_remoteBackend.RequestNeighbourInfo(regionHandle);
127 return info; 127 return info;
128 } 128 }
129 129
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
283 // if (teleport success) // seems to be always success here 283 // if (teleport success) // seems to be always success here
284 // the user may change their profile information in other region, 284 // the user may change their profile information in other region,
285 // so the userinfo in UserProfileCache is not reliable any more, delete it 285 // so the userinfo in UserProfileCache is not reliable any more, delete it
286 if (avatar.Scene.NeedSceneCacheClear(avatar.UUID)) 286 if (avatar.Scene.NeedSceneCacheClear(avatar.UUID) || isHyperLink)
287 { 287 {
288 m_commsProvider.UserProfileCacheService.RemoveUser(avatar.UUID); 288 m_commsProvider.UserProfileCacheService.RemoveUser(avatar.UUID);
289 m_log.InfoFormat("[HGSceneCommService]: User {0} is going to another region, profile cache removed", avatar.UUID); 289 m_log.InfoFormat("[HGSceneCommService]: User {0} is going to another region, profile cache removed", avatar.UUID);