aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Communications/Hypergrid
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Communications/Hypergrid')
-rw-r--r--OpenSim/Region/Communications/Hypergrid/HGGridServices.cs50
1 files changed, 26 insertions, 24 deletions
diff --git a/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs b/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs
index 54cde0f..85bfab4 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs
@@ -596,16 +596,16 @@ namespace OpenSim.Region.Communications.Hypergrid
596 //m_log.Debug(" >> " + loginParams["region_uuid"] + " <<"); 596 //m_log.Debug(" >> " + loginParams["region_uuid"] + " <<");
597 //m_log.Debug(" --------- ---------------- -------"); 597 //m_log.Debug(" --------- ---------------- -------");
598 598
599 string serverURI = ""; 599 //string serverURI = "";
600 if (u.UserProfile is ForeignUserProfileData) 600 //if (u.UserProfile is ForeignUserProfileData)
601 serverURI = HGNetworkServersInfo.ServerURI(((ForeignUserProfileData)u.UserProfile).UserServerURI); 601 // serverURI = Util.ServerURI(((ForeignUserProfileData)u.UserProfile).UserServerURI);
602 loginParams["userserver_id"] = (serverURI == "") || (serverURI == null) ? HGNetworkServersInfo.Singleton.LocalUserServerURI : serverURI; 602 //loginParams["userserver_id"] = (serverURI == "") || (serverURI == null) ? HGNetworkServersInfo.Singleton.LocalUserServerURI : serverURI;
603 603
604 serverURI = HGNetworkServersInfo.ServerURI(u.UserProfile.UserAssetURI); 604 //serverURI = HGNetworkServersInfo.ServerURI(u.UserProfile.UserAssetURI);
605 loginParams["assetserver_id"] = (serverURI == "") || (serverURI == null) ? HGNetworkServersInfo.Singleton.LocalAssetServerURI : serverURI; 605 //loginParams["assetserver_id"] = (serverURI == "") || (serverURI == null) ? HGNetworkServersInfo.Singleton.LocalAssetServerURI : serverURI;
606 606
607 serverURI = HGNetworkServersInfo.ServerURI(u.UserProfile.UserInventoryURI); 607 //serverURI = HGNetworkServersInfo.ServerURI(u.UserProfile.UserInventoryURI);
608 loginParams["inventoryserver_id"] = (serverURI == "") || (serverURI == null) ? HGNetworkServersInfo.Singleton.LocalInventoryServerURI : serverURI; 608 //loginParams["inventoryserver_id"] = (serverURI == "") || (serverURI == null) ? HGNetworkServersInfo.Singleton.LocalInventoryServerURI : serverURI;
609 609
610 loginParams["root_folder_id"] = u.UserProfile.RootInventoryFolderID; 610 loginParams["root_folder_id"] = u.UserProfile.RootInventoryFolderID;
611 611
@@ -949,33 +949,35 @@ namespace OpenSim.Region.Communications.Hypergrid
949 949
950 protected bool IsComingHome(ForeignUserProfileData userData) 950 protected bool IsComingHome(ForeignUserProfileData userData)
951 { 951 {
952 return (userData.UserServerURI == HGNetworkServersInfo.Singleton.LocalUserServerURI); 952 return false; //(userData.UserServerURI == HGNetworkServersInfo.Singleton.LocalUserServerURI);
953 } 953 }
954 954
955 protected bool IsGoingHome(CachedUserInfo uinfo, RegionInfo rinfo) 955 protected bool IsGoingHome(CachedUserInfo uinfo, RegionInfo rinfo)
956 { 956 {
957 if (uinfo.UserProfile == null) 957 return false;
958 return false; 958 //if (uinfo.UserProfile == null)
959 // return false;
959 960
960 string userUserServerURI = String.Empty; 961 //string userUserServerURI = String.Empty;
961 if (uinfo.UserProfile is ForeignUserProfileData) 962 //if (uinfo.UserProfile is ForeignUserProfileData)
962 { 963 //{
963 userUserServerURI = HGNetworkServersInfo.ServerURI(((ForeignUserProfileData)uinfo.UserProfile).UserServerURI); 964 // userUserServerURI = HGNetworkServersInfo.ServerURI(((ForeignUserProfileData)uinfo.UserProfile).UserServerURI);
964 } 965 //}
965 966
966 return ((uinfo.UserProfile.HomeRegionID == rinfo.RegionID) && 967 //return ((uinfo.UserProfile.HomeRegionID == rinfo.RegionID) &&
967 (userUserServerURI != HGNetworkServersInfo.Singleton.LocalUserServerURI)); 968 // (userUserServerURI != HGNetworkServersInfo.Singleton.LocalUserServerURI));
968 } 969 }
969 970
970 protected bool IsLocalUser(CachedUserInfo uinfo) 971 protected bool IsLocalUser(CachedUserInfo uinfo)
971 { 972 {
972 if (uinfo == null) 973 return true;
973 return true; 974 //if (uinfo == null)
975 // return true;
974 976
975 if (uinfo.UserProfile is ForeignUserProfileData) 977 //if (uinfo.UserProfile is ForeignUserProfileData)
976 return HGNetworkServersInfo.Singleton.IsLocalUser(((ForeignUserProfileData)uinfo.UserProfile).UserServerURI); 978 // return HGNetworkServersInfo.Singleton.IsLocalUser(((ForeignUserProfileData)uinfo.UserProfile).UserServerURI);
977 else 979 //else
978 return true; 980 // return true;
979 981
980 } 982 }
981 983