ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-09 18:55:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Starting to clean the house...

Browse Source 
* Fixed circular dependency
This commit is contained in:
Diva Canto
2010-01-10 16:20:59 -08:00
parent e31131b40f
commit 53e83e5dbb
10 changed files with 22 additions and 1416 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
View File

@@ -325,7 +325,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
{
m_archiveWriter.WriteFile(
ArchiveConstants.USERS_PATH + creator.FirstName + " " + creator.LastName + ".xml",
UserProfileSerializer.Serialize(creator));
UserProfileSerializer.Serialize(creator.PrincipalID, creator.FirstName, creator.LastName));
}
else
{

35
OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs
View File

@@ -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;
// 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 == null)
// return false;
if (!(uinfo.UserProfile is ForeignUserProfileData))
// it's a home user, can't be outside to return home
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);
}
// // 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)
{