Merge branch 'master' into careminster

Conflicts:
	OpenSim/Data/MySQL/Resources/RegionStore.migrations
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs

1 files changed, 1 insertions, 1 deletions

diff --git a/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs b/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs
index d5a6521..0d7ced9 100644
--- a/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs
+++ b/OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs
@@ -129,7 +129,7 @@ namespace OpenSim.Services.AuthenticationService
                 {
                     m_log.DebugFormat(
                         "[AUTH SERVICE]: Salted hash {0} of given password did not match salted hash of {1} for PrincipalID {2}.  Authentication failure.",
-                        principalID);
+                        hashed, data.Data["passwordHash"], principalID);
                     return String.Empty;
                 }
             }