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/Communications/Hypergrid | |
parent | Add a "LockedOut" flag to allow locking a region out via the grid server. (diff) | |
download | opensim-SC_OLD-1e1b2ab221851efc414678b7ea52ef2ca788ce9f.zip opensim-SC_OLD-1e1b2ab221851efc414678b7ea52ef2ca788ce9f.tar.gz opensim-SC_OLD-1e1b2ab221851efc414678b7ea52ef2ca788ce9f.tar.bz2 opensim-SC_OLD-1e1b2ab221851efc414678b7ea52ef2ca788ce9f.tar.xz |
* OMG! All but one references to UserProfileCacheService have been rerouted!
* HG is seriously broken here
* Compiles. Untested.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Communications/Hypergrid/HGUserServices.cs | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs b/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs index 09d8285..12bc64d 100644 --- a/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs +++ b/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs | |||
@@ -319,18 +319,19 @@ namespace OpenSim.Region.Communications.Hypergrid | |||
319 | return m_commsManager.NetworkServersInfo.UserURL; | 319 | return m_commsManager.NetworkServersInfo.UserURL; |
320 | } | 320 | } |
321 | 321 | ||
322 | [Obsolete] | ||
322 | public bool IsForeignUser(UUID userID, out string userServerURL) | 323 | public bool IsForeignUser(UUID userID, out string userServerURL) |
323 | { | 324 | { |
324 | userServerURL = m_commsManager.NetworkServersInfo.UserURL; | 325 | userServerURL = m_commsManager.NetworkServersInfo.UserURL; |
325 | CachedUserInfo uinfo = m_commsManager.UserProfileCacheService.GetUserDetails(userID); | 326 | //CachedUserInfo uinfo = m_commsManager.UserProfileCacheService.GetUserDetails(userID); |
326 | if (uinfo != null) | 327 | //if (uinfo != null) |
327 | { | 328 | //{ |
328 | if (!HGNetworkServersInfo.Singleton.IsLocalUser(uinfo.UserProfile)) | 329 | // if (!HGNetworkServersInfo.Singleton.IsLocalUser(uinfo.UserProfile)) |
329 | { | 330 | // { |
330 | userServerURL = ((ForeignUserProfileData)(uinfo.UserProfile)).UserServerURI; | 331 | // userServerURL = ((ForeignUserProfileData)(uinfo.UserProfile)).UserServerURI; |
331 | return true; | 332 | // return true; |
332 | } | 333 | // } |
333 | } | 334 | //} |
334 | return false; | 335 | return false; |
335 | } | 336 | } |
336 | } | 337 | } |