1 files changed, 89 insertions, 36 deletions

diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
index ecd60bd..71b3062 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
@@ -34,7 +34,7 @@ using Nini.Config;
 using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications;
-using OpenSim.Framework.Communications.Cache;
+
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Services.Interfaces;
@@ -113,7 +113,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         /// Trigger the inventory archive saved event.
         /// </summary>
         protected internal void TriggerInventoryArchiveSaved(
-            Guid id, bool succeeded, CachedUserInfo userInfo, string invPath, Stream saveStream, 
+            Guid id, bool succeeded, UserAccount userInfo, string invPath, Stream saveStream, 
             Exception reportedException)
         {
             InventoryArchiveSaved handlerInventoryArchiveSaved = OnInventoryArchiveSaved;
@@ -125,20 +125,33 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         {
             if (m_scenes.Count > 0)
             {
-                CachedUserInfo userInfo = GetUserInfo(firstName, lastName, pass);
+                UserAccount userInfo = GetUserInfo(firstName, lastName, pass);
 
                 if (userInfo != null)
                 {
-                    if (CheckPresence(userInfo.UserProfile.ID))
+                    if (CheckPresence(userInfo.PrincipalID))
                     {
-                        new InventoryArchiveWriteRequest(id, this, m_aScene, userInfo, invPath, saveStream).Execute();
+                        try
+                        {
+                            new InventoryArchiveWriteRequest(id, this, m_aScene, userInfo, invPath, saveStream).Execute();
+                        }
+                        catch (EntryPointNotFoundException e)
+                        {
+                            m_log.ErrorFormat(
+                                "[ARCHIVER]: Mismatch between Mono and zlib1g library version when trying to create compression stream."
+                                    + "If you've manually installed Mono, have you appropriately updated zlib1g as well?");
+                            m_log.Error(e);
+
+                            return false;
+                        }
+                    
                         return true;
                     }
                     else
                     {
                         m_log.ErrorFormat(
-                            "[INVENTORY ARCHIVER]: User {0} {1} not logged in to this region simulator",
-                            userInfo.UserProfile.Name, userInfo.UserProfile.ID);
+                            "[INVENTORY ARCHIVER]: User {0} {1} {2} not logged in to this region simulator",
+                            userInfo.FirstName, userInfo.LastName, userInfo.PrincipalID);
                     }
                 }
             }
@@ -150,20 +163,33 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         {
             if (m_scenes.Count > 0)
             {
-                CachedUserInfo userInfo = GetUserInfo(firstName, lastName, pass);
+                UserAccount userInfo = GetUserInfo(firstName, lastName, pass);
                 
                 if (userInfo != null)
                 {
-                    if (CheckPresence(userInfo.UserProfile.ID))
+                    if (CheckPresence(userInfo.PrincipalID))
                     {
-                        new InventoryArchiveWriteRequest(id, this, m_aScene, userInfo, invPath, savePath).Execute();
+                        try
+                        {
+                            new InventoryArchiveWriteRequest(id, this, m_aScene, userInfo, invPath, savePath).Execute();
+                        }
+                        catch (EntryPointNotFoundException e)
+                        {
+                            m_log.ErrorFormat(
+                                "[ARCHIVER]: Mismatch between Mono and zlib1g library version when trying to create compression stream."
+                                    + "If you've manually installed Mono, have you appropriately updated zlib1g as well?");
+                            m_log.Error(e);
+
+                            return false;
+                        }
+                    
                         return true;
                     }
                     else
                     {
                         m_log.ErrorFormat(
-                            "[INVENTORY ARCHIVER]: User {0} {1} not logged in to this region simulator",
-                            userInfo.UserProfile.Name, userInfo.UserProfile.ID);
+                            "[INVENTORY ARCHIVER]: User {0} {1} {2} not logged in to this region simulator",
+                            userInfo.FirstName, userInfo.LastName, userInfo.PrincipalID);
                     }
                 }
             }
@@ -175,14 +201,28 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         {
             if (m_scenes.Count > 0)
             {
-                CachedUserInfo userInfo = GetUserInfo(firstName, lastName, pass);
+                UserAccount userInfo = GetUserInfo(firstName, lastName, pass);
                         
                 if (userInfo != null)
                 {
-                    if (CheckPresence(userInfo.UserProfile.ID))
+                    if (CheckPresence(userInfo.PrincipalID))
                     {
-                        InventoryArchiveReadRequest request = 
-                            new InventoryArchiveReadRequest(m_aScene, userInfo, invPath, loadStream);
+                        InventoryArchiveReadRequest request;
+                        
+                        try
+                        {
+                            request = new InventoryArchiveReadRequest(m_aScene, userInfo, invPath, loadStream);
+                        }
+                        catch (EntryPointNotFoundException e)
+                        {
+                            m_log.ErrorFormat(
+                                "[ARCHIVER]: Mismatch between Mono and zlib1g library version when trying to create compression stream."
+                                    + "If you've manually installed Mono, have you appropriately updated zlib1g as well?");
+                            m_log.Error(e);
+
+                            return false;
+                        }
+                    
                         UpdateClientWithLoadedNodes(userInfo, request.Execute());
 
                         return true;
@@ -190,8 +230,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                     else
                     {
                         m_log.ErrorFormat(
-                            "[INVENTORY ARCHIVER]: User {0} {1} not logged in to this region simulator",
-                            userInfo.UserProfile.Name, userInfo.UserProfile.ID);
+                            "[INVENTORY ARCHIVER]: User {0} {1} {2} not logged in to this region simulator",
+                            userInfo.FirstName, userInfo.LastName, userInfo.PrincipalID);
                     }
                 }
             }
@@ -203,14 +243,28 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         {
             if (m_scenes.Count > 0)
             {
-                CachedUserInfo userInfo = GetUserInfo(firstName, lastName, pass);
+                UserAccount userInfo = GetUserInfo(firstName, lastName, pass);
                 
                 if (userInfo != null)
                 {
-                    if (CheckPresence(userInfo.UserProfile.ID))
+                    if (CheckPresence(userInfo.PrincipalID))
                     {
-                        InventoryArchiveReadRequest request = 
-                            new InventoryArchiveReadRequest(m_aScene, userInfo, invPath, loadPath);
+                        InventoryArchiveReadRequest request;
+                        
+                        try
+                        {
+                            request = new InventoryArchiveReadRequest(m_aScene, userInfo, invPath, loadPath);
+                        }
+                        catch (EntryPointNotFoundException e)
+                        {
+                            m_log.ErrorFormat(
+                                "[ARCHIVER]: Mismatch between Mono and zlib1g library version when trying to create compression stream."
+                                    + "If you've manually installed Mono, have you appropriately updated zlib1g as well?");
+                            m_log.Error(e);
+
+                            return false;
+                        }
+                        
                         UpdateClientWithLoadedNodes(userInfo, request.Execute());
 
                         return true;
@@ -218,8 +272,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                     else
                     {
                         m_log.ErrorFormat(
-                            "[INVENTORY ARCHIVER]: User {0} {1} not logged in to this region simulator",
-                            userInfo.UserProfile.Name, userInfo.UserProfile.ID);
+                            "[INVENTORY ARCHIVER]: User {0} {1} {2} not logged in to this region simulator",
+                            userInfo.FirstName, userInfo.LastName, userInfo.PrincipalID);
                     }
                 }
             }
@@ -291,7 +345,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         }
         
         private void SaveInvConsoleCommandCompleted(
-            Guid id, bool succeeded, CachedUserInfo userInfo, string invPath, Stream saveStream, 
+            Guid id, bool succeeded, UserAccount userInfo, string invPath, Stream saveStream, 
             Exception reportedException)
         {
             lock (m_pendingConsoleSaves)
@@ -304,13 +358,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
             
             if (succeeded)
             {
-                m_log.InfoFormat("[INVENTORY ARCHIVER]: Saved archive for {0}", userInfo.UserProfile.Name);
+                m_log.InfoFormat("[INVENTORY ARCHIVER]: Saved archive for {0} {1}", userInfo.FirstName, userInfo.LastName);
             }
             else
             {
                 m_log.ErrorFormat(
-                    "[INVENTORY ARCHIVER]: Archive save for {0} failed - {1}", 
-                    userInfo.UserProfile.Name, reportedException.Message);
+                    "[INVENTORY ARCHIVER]: Archive save for {0} {1} failed - {2}", 
+                    userInfo.FirstName, userInfo.LastName, reportedException.Message);
             }
         }
         
@@ -321,11 +375,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         /// <param name="lastName"></param>
         /// <param name="pass">User password</param>
         /// <returns></returns>
-        protected CachedUserInfo GetUserInfo(string firstName, string lastName, string pass)
+        protected UserAccount GetUserInfo(string firstName, string lastName, string pass)
         {
-            CachedUserInfo userInfo = m_aScene.CommsManager.UserProfileCacheService.GetUserDetails(firstName, lastName);
-            //m_aScene.CommsManager.UserService.GetUserProfile(firstName, lastName);
-            if (null == userInfo)
+            UserAccount account = m_aScene.UserAccountService.GetUserAccount(m_aScene.RegionInfo.ScopeID, firstName, lastName);
+            if (null == account)
             {
                 m_log.ErrorFormat(
                     "[INVENTORY ARCHIVER]: Failed to find user info for {0} {1}", 
@@ -335,9 +388,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
 
             try
             {
-                if (m_aScene.CommsManager.UserService.AuthenticateUserByPassword(userInfo.UserProfile.ID, pass))
+                if (m_aScene.AuthenticationService.Authenticate(account.PrincipalID, pass, 1) != string.Empty)
                 {
-                    return userInfo;
+                    return account;
                 }
                 else
                 {
@@ -358,14 +411,14 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         /// Notify the client of loaded nodes if they are logged in
         /// </summary>
         /// <param name="loadedNodes">Can be empty.  In which case, nothing happens</param>
-        private void UpdateClientWithLoadedNodes(CachedUserInfo userInfo, List<InventoryNodeBase> loadedNodes)
+        private void UpdateClientWithLoadedNodes(UserAccount userInfo, List<InventoryNodeBase> loadedNodes)
         {
             if (loadedNodes.Count == 0)
                 return;
                    
             foreach (Scene scene in m_scenes.Values)
             {
-                ScenePresence user = scene.GetScenePresence(userInfo.UserProfile.ID);
+                ScenePresence user = scene.GetScenePresence(userInfo.PrincipalID);
                 
                 if (user != null && !user.IsChildAgent)
                 {