diff options
author | Diva Canto | 2010-01-10 16:20:59 -0800 |
---|---|---|
committer | Diva Canto | 2010-01-10 16:20:59 -0800 |
commit | 53e83e5dbb3590cb9c858aa301665357d1511b30 (patch) | |
tree | 732c828f49c3c54dc49bcd6eec86153ab76bc8ae /OpenSim/Region | |
parent | Some typos fixed related to master avie removal (diff) | |
download | opensim-SC_OLD-53e83e5dbb3590cb9c858aa301665357d1511b30.zip opensim-SC_OLD-53e83e5dbb3590cb9c858aa301665357d1511b30.tar.gz opensim-SC_OLD-53e83e5dbb3590cb9c858aa301665357d1511b30.tar.bz2 opensim-SC_OLD-53e83e5dbb3590cb9c858aa301665357d1511b30.tar.xz |
* Starting to clean the house...
* Fixed circular dependency
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs | 41 |
2 files changed, 22 insertions, 21 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs index ab5dafd..0d9d758 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs | |||
@@ -325,7 +325,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
325 | { | 325 | { |
326 | m_archiveWriter.WriteFile( | 326 | m_archiveWriter.WriteFile( |
327 | ArchiveConstants.USERS_PATH + creator.FirstName + " " + creator.LastName + ".xml", | 327 | ArchiveConstants.USERS_PATH + creator.FirstName + " " + creator.LastName + ".xml", |
328 | UserProfileSerializer.Serialize(creator)); | 328 | UserProfileSerializer.Serialize(creator.PrincipalID, creator.FirstName, creator.LastName)); |
329 | } | 329 | } |
330 | else | 330 | else |
331 | { | 331 | { |
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 | |||
763 | return (userData.UserServerURI == LocalUserServerURI); | 763 | return (userData.UserServerURI == LocalUserServerURI); |
764 | } | 764 | } |
765 | 765 | ||
766 | // Is the user going back to the home region or the home grid? | 766 | // REFACTORING PROBLEM |
767 | protected bool IsGoingHome(CachedUserInfo uinfo, GridRegion rinfo) | 767 | //// Is the user going back to the home region or the home grid? |
768 | { | 768 | //protected bool IsGoingHome(CachedUserInfo uinfo, GridRegion rinfo) |
769 | if (uinfo == null) | 769 | //{ |
770 | return false; | 770 | // if (uinfo == null) |
771 | 771 | // return false; | |
772 | if (uinfo.UserProfile == null) | 772 | |
773 | return false; | 773 | // if (uinfo.UserProfile == null) |
774 | 774 | // return false; | |
775 | if (!(uinfo.UserProfile is ForeignUserProfileData)) | 775 | |
776 | // it's a home user, can't be outside to return home | 776 | // if (!(uinfo.UserProfile is ForeignUserProfileData)) |
777 | return false; | 777 | // // it's a home user, can't be outside to return home |
778 | 778 | // return false; | |
779 | // OK, it's a foreign user with a ForeignUserProfileData | 779 | |
780 | // and is going back to exactly the home region. | 780 | // // OK, it's a foreign user with a ForeignUserProfileData |
781 | // We can't check if it's going back to a non-home region | 781 | // // and is going back to exactly the home region. |
782 | // of the home grid. That will be dealt with in the | 782 | // // We can't check if it's going back to a non-home region |
783 | // receiving end | 783 | // // of the home grid. That will be dealt with in the |
784 | return (uinfo.UserProfile.HomeRegionID == rinfo.RegionID); | 784 | // // receiving end |
785 | } | 785 | // return (uinfo.UserProfile.HomeRegionID == rinfo.RegionID); |
786 | //} | ||
786 | 787 | ||
787 | protected bool IsLocalUser(UserAccount account) | 788 | protected bool IsLocalUser(UserAccount account) |
788 | { | 789 | { |