Merge branch 'master' into httptests

2026-08-09 18:55:58 +08:00 · 2016-11-03 14:01:35 +00:00
parent 8c7fe3c0db 4b326f8691
commit 01a4a883e0
9 changed files with 90 additions and 87 deletions
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
@@ -565,8 +565,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                return null;
            }

-            return account;
-            /*
            try
            {
                string encpass = Util.Md5Hash(pass);
@@ -587,7 +585,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                m_log.ErrorFormat("[INVENTORY ARCHIVER]: Could not authenticate password, {0}", e);
                return null;
            }
-            */
        }

        /// <summary>