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
                 {
                     m_archiveWriter.WriteFile(
                         ArchiveConstants.USERS_PATH + creator.FirstName + " " + creator.LastName + ".xml",
-                        UserProfileSerializer.Serialize(creator));
+                        UserProfileSerializer.Serialize(creator.PrincipalID, creator.FirstName, creator.LastName));
                 }
                 else
                 {
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)
         {