diff options
| author | Teravus Ovares (Dan Olivares) | 2009-09-06 16:15:20 -0400 |
|---|---|---|
| committer | Teravus Ovares (Dan Olivares) | 2009-09-06 16:15:20 -0400 |
| commit | 8797a8209829c0a3fe7ff9edbe46e2d636a546a8 (patch) | |
| tree | e0637dd04b59f4387e160e9d26887d94904588d8 /OpenSim/Region/Communications/Hypergrid/HGUserServices.cs | |
| parent | * Moves another Legacy avatar inbounds check to Border (diff) | |
| parent | Addendum to last commit. With the last commit, some other code that should (diff) | |
| download | opensim-SC_OLD-8797a8209829c0a3fe7ff9edbe46e2d636a546a8.zip opensim-SC_OLD-8797a8209829c0a3fe7ff9edbe46e2d636a546a8.tar.gz opensim-SC_OLD-8797a8209829c0a3fe7ff9edbe46e2d636a546a8.tar.bz2 opensim-SC_OLD-8797a8209829c0a3fe7ff9edbe46e2d636a546a8.tar.xz | |
Merge branch 'master' of ssh://MyConnection/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Communications/Hypergrid/HGUserServices.cs')
| -rw-r--r-- | OpenSim/Region/Communications/Hypergrid/HGUserServices.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs b/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs index aaa1c78..f1a56ef 100644 --- a/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs +++ b/OpenSim/Region/Communications/Hypergrid/HGUserServices.cs | |||
| @@ -313,7 +313,7 @@ namespace OpenSim.Region.Communications.Hypergrid | |||
| 313 | 313 | ||
| 314 | public bool IsForeignUser(UUID userID, out string userServerURL) | 314 | public bool IsForeignUser(UUID userID, out string userServerURL) |
| 315 | { | 315 | { |
| 316 | userServerURL = string.Empty; | 316 | userServerURL = m_commsManager.NetworkServersInfo.UserURL; |
| 317 | CachedUserInfo uinfo = m_commsManager.UserProfileCacheService.GetUserDetails(userID); | 317 | CachedUserInfo uinfo = m_commsManager.UserProfileCacheService.GetUserDetails(userID); |
| 318 | if (uinfo != null) | 318 | if (uinfo != null) |
| 319 | { | 319 | { |