From 53e83e5dbb3590cb9c858aa301665357d1511b30 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sun, 10 Jan 2010 16:20:59 -0800 Subject: * Starting to clean the house... * Fixed circular dependency --- .../ServiceConnectorsOut/Grid/HGGridConnector.cs | 41 +++++++++++----------- 1 file changed, 21 insertions(+), 20 deletions(-) (limited to 'OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid') diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs index 3c1f7b6..f3ccbda 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs @@ -763,26 +763,27 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid return (userData.UserServerURI == LocalUserServerURI); } - // Is the user going back to the home region or the home grid? - protected bool IsGoingHome(CachedUserInfo uinfo, GridRegion rinfo) - { - if (uinfo == null) - return false; - - if (uinfo.UserProfile == null) - return false; - - if (!(uinfo.UserProfile is ForeignUserProfileData)) - // it's a home user, can't be outside to return home - return false; - - // OK, it's a foreign user with a ForeignUserProfileData - // and is going back to exactly the home region. - // We can't check if it's going back to a non-home region - // of the home grid. That will be dealt with in the - // receiving end - return (uinfo.UserProfile.HomeRegionID == rinfo.RegionID); - } + // REFACTORING PROBLEM + //// Is the user going back to the home region or the home grid? + //protected bool IsGoingHome(CachedUserInfo uinfo, GridRegion rinfo) + //{ + // if (uinfo == null) + // return false; + + // if (uinfo.UserProfile == null) + // return false; + + // if (!(uinfo.UserProfile is ForeignUserProfileData)) + // // it's a home user, can't be outside to return home + // return false; + + // // OK, it's a foreign user with a ForeignUserProfileData + // // and is going back to exactly the home region. + // // We can't check if it's going back to a non-home region + // // of the home grid. That will be dealt with in the + // // receiving end + // return (uinfo.UserProfile.HomeRegionID == rinfo.RegionID); + //} protected bool IsLocalUser(UserAccount account) { -- cgit v1.1