aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services
diff options
context:
space:
mode:
authorMelanie2012-02-04 11:48:20 +0000
committerMelanie2012-02-04 11:48:20 +0000
commitce5e900721cb0447f76bcb198faf5f7c31eeaf6e (patch)
treec906a2b8858f9c590e39e2a26f47017fd7b6b9c6 /OpenSim/Services
parentMerge branch 'master' into careminster (diff)
parentAdd default value to TelehubObject (diff)
downloadopensim-SC_OLD-ce5e900721cb0447f76bcb198faf5f7c31eeaf6e.zip
opensim-SC_OLD-ce5e900721cb0447f76bcb198faf5f7c31eeaf6e.tar.gz
opensim-SC_OLD-ce5e900721cb0447f76bcb198faf5f7c31eeaf6e.tar.bz2
opensim-SC_OLD-ce5e900721cb0447f76bcb198faf5f7c31eeaf6e.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
Diffstat (limited to 'OpenSim/Services')
-rw-r--r--OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs2
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
129 { 129 {
130 m_log.DebugFormat( 130 m_log.DebugFormat(
131 "[AUTH SERVICE]: Salted hash {0} of given password did not match salted hash of {1} for PrincipalID {2}. Authentication failure.", 131 "[AUTH SERVICE]: Salted hash {0} of given password did not match salted hash of {1} for PrincipalID {2}. Authentication failure.",
132 principalID); 132 hashed, data.Data["passwordHash"], principalID);
133 return String.Empty; 133 return String.Empty;
134 } 134 }
135 } 135 }