diff options
Diffstat (limited to 'OpenSim/Server/Handlers')
-rw-r--r-- | OpenSim/Server/Handlers/Asset/AssetServerConnector.cs | 6 | ||||
-rw-r--r-- | OpenSim/Server/Handlers/Authentication/OpenIdServerHandler.cs | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs b/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs index 9b80245..8b9e749 100644 --- a/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs +++ b/OpenSim/Server/Handlers/Asset/AssetServerConnector.cs | |||
@@ -72,19 +72,19 @@ namespace OpenSim.Server.Handlers.Asset | |||
72 | server.AddStreamHandler(new AssetServerPostHandler(m_AssetService)); | 72 | server.AddStreamHandler(new AssetServerPostHandler(m_AssetService)); |
73 | server.AddStreamHandler(new AssetServerDeleteHandler(m_AssetService, allowDelete)); | 73 | server.AddStreamHandler(new AssetServerDeleteHandler(m_AssetService, allowDelete)); |
74 | 74 | ||
75 | MainConsole.Instance.Commands.AddCommand("kfs", false, | 75 | MainConsole.Instance.Commands.AddCommand("Assets", false, |
76 | "show asset", | 76 | "show asset", |
77 | "show asset <ID>", | 77 | "show asset <ID>", |
78 | "Show asset information", | 78 | "Show asset information", |
79 | HandleShowAsset); | 79 | HandleShowAsset); |
80 | 80 | ||
81 | MainConsole.Instance.Commands.AddCommand("kfs", false, | 81 | MainConsole.Instance.Commands.AddCommand("Assets", false, |
82 | "delete asset", | 82 | "delete asset", |
83 | "delete asset <ID>", | 83 | "delete asset <ID>", |
84 | "Delete asset from database", | 84 | "Delete asset from database", |
85 | HandleDeleteAsset); | 85 | HandleDeleteAsset); |
86 | 86 | ||
87 | MainConsole.Instance.Commands.AddCommand("kfs", false, | 87 | MainConsole.Instance.Commands.AddCommand("Assets", false, |
88 | "dump asset", | 88 | "dump asset", |
89 | "dump asset <ID>", | 89 | "dump asset <ID>", |
90 | "Dump asset to a file", | 90 | "Dump asset to a file", |
diff --git a/OpenSim/Server/Handlers/Authentication/OpenIdServerHandler.cs b/OpenSim/Server/Handlers/Authentication/OpenIdServerHandler.cs index 440b898..dfed761 100644 --- a/OpenSim/Server/Handlers/Authentication/OpenIdServerHandler.cs +++ b/OpenSim/Server/Handlers/Authentication/OpenIdServerHandler.cs | |||
@@ -248,7 +248,7 @@ For more information, see <a href='http://openid.net/'>http://openid.net/</a>. | |||
248 | if (passwordValues != null && passwordValues.Length == 1) | 248 | if (passwordValues != null && passwordValues.Length == 1) |
249 | { | 249 | { |
250 | if (account != null && | 250 | if (account != null && |
251 | (m_authenticationService.Authenticate(account.PrincipalID, passwordValues[0], 30) != string.Empty)) | 251 | (m_authenticationService.Authenticate(account.PrincipalID,Util.Md5Hash(passwordValues[0]), 30) != string.Empty)) |
252 | authRequest.IsAuthenticated = true; | 252 | authRequest.IsAuthenticated = true; |
253 | else | 253 | else |
254 | authRequest.IsAuthenticated = false; | 254 | authRequest.IsAuthenticated = false; |