diff options
author | Diva Canto | 2010-01-10 10:40:07 -0800 |
---|---|---|
committer | Diva Canto | 2010-01-10 10:40:07 -0800 |
commit | 1e1b2ab221851efc414678b7ea52ef2ca788ce9f (patch) | |
tree | 29b6aa80e54a9c18529ae14e7d185fe67582d151 /OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs | |
parent | Add a "LockedOut" flag to allow locking a region out via the grid server. (diff) | |
download | opensim-SC-1e1b2ab221851efc414678b7ea52ef2ca788ce9f.zip opensim-SC-1e1b2ab221851efc414678b7ea52ef2ca788ce9f.tar.gz opensim-SC-1e1b2ab221851efc414678b7ea52ef2ca788ce9f.tar.bz2 opensim-SC-1e1b2ab221851efc414678b7ea52ef2ca788ce9f.tar.xz |
* OMG! All but one references to UserProfileCacheService have been rerouted!
* HG is seriously broken here
* Compiles. Untested.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs index f64a7a0..61419e6 100644 --- a/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs +++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGSceneCommunicationService.cs | |||
@@ -141,13 +141,9 @@ namespace OpenSim.Region.Framework.Scenes.Hypergrid | |||
141 | bool isHyperLink = (HyperlinkService.GetHyperlinkRegion(reg.RegionHandle) != null); | 141 | bool isHyperLink = (HyperlinkService.GetHyperlinkRegion(reg.RegionHandle) != null); |
142 | bool isHomeUser = true; | 142 | bool isHomeUser = true; |
143 | ulong realHandle = regionHandle; | 143 | ulong realHandle = regionHandle; |
144 | CachedUserInfo uinfo = m_commsProvider.UserProfileCacheService.GetUserDetails(avatar.UUID); | 144 | isHomeUser = HyperlinkService.IsLocalUser(avatar.UUID); |
145 | if (uinfo != null) | 145 | realHandle = m_hg.FindRegionHandle(regionHandle); |
146 | { | 146 | m_log.Debug("XXX ---- home user? " + isHomeUser + " --- hyperlink? " + isHyperLink + " --- real handle: " + realHandle.ToString()); |
147 | isHomeUser = HyperlinkService.IsLocalUser(uinfo.UserProfile.ID); | ||
148 | realHandle = m_hg.FindRegionHandle(regionHandle); | ||
149 | m_log.Debug("XXX ---- home user? " + isHomeUser + " --- hyperlink? " + isHyperLink + " --- real handle: " + realHandle.ToString()); | ||
150 | } | ||
151 | /// | 147 | /// |
152 | /// Hypergrid mod stop | 148 | /// Hypergrid mod stop |
153 | /// | 149 | /// |
@@ -352,7 +348,8 @@ namespace OpenSim.Region.Framework.Scenes.Hypergrid | |||
352 | // so the userinfo in UserProfileCache is not reliable any more, delete it | 348 | // so the userinfo in UserProfileCache is not reliable any more, delete it |
353 | if (avatar.Scene.NeedSceneCacheClear(avatar.UUID) || isHyperLink) | 349 | if (avatar.Scene.NeedSceneCacheClear(avatar.UUID) || isHyperLink) |
354 | { | 350 | { |
355 | m_commsProvider.UserProfileCacheService.RemoveUser(avatar.UUID); | 351 | // REFACTORING PROBLEM!!!! |
352 | //m_commsProvider.UserProfileCacheService.RemoveUser(avatar.UUID); | ||
356 | m_log.DebugFormat( | 353 | m_log.DebugFormat( |
357 | "[HGSceneCommService]: User {0} is going to another region, profile cache removed", | 354 | "[HGSceneCommService]: User {0} is going to another region, profile cache removed", |
358 | avatar.UUID); | 355 | avatar.UUID); |