diff options
| author | Melanie | 2009-12-12 04:14:47 +0000 |
|---|---|---|
| committer | Melanie | 2009-12-12 04:14:47 +0000 |
| commit | 1382dc976cda9982eab05b45e24934f5c6c7067f (patch) | |
| tree | 02fa3bf28d8092d9521450be2e6d10dcee16e83e /OpenSim/Framework/Communications/Clients | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC-1382dc976cda9982eab05b45e24934f5c6c7067f.zip opensim-SC-1382dc976cda9982eab05b45e24934f5c6c7067f.tar.gz opensim-SC-1382dc976cda9982eab05b45e24934f5c6c7067f.tar.bz2 opensim-SC-1382dc976cda9982eab05b45e24934f5c6c7067f.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Framework/Communications/Clients')
| -rw-r--r-- | OpenSim/Framework/Communications/Clients/AuthClient.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/Communications/Clients/AuthClient.cs b/OpenSim/Framework/Communications/Clients/AuthClient.cs index 6b4bfec..adae637 100644 --- a/OpenSim/Framework/Communications/Clients/AuthClient.cs +++ b/OpenSim/Framework/Communications/Clients/AuthClient.cs | |||
| @@ -136,7 +136,7 @@ namespace OpenSim.Framework.Communications.Clients | |||
| 136 | } | 136 | } |
| 137 | 137 | ||
| 138 | Hashtable responseData = (Hashtable)UserResp.Value; | 138 | Hashtable responseData = (Hashtable)UserResp.Value; |
| 139 | if (responseData.ContainsKey("auth_session") && responseData["auth_session"].ToString() == "TRUE") | 139 | if (responseData != null && responseData.ContainsKey("auth_session") && responseData["auth_session"] != null && responseData["auth_session"].ToString() == "TRUE") |
| 140 | { | 140 | { |
| 141 | //System.Console.WriteLine("[Authorization]: userserver reported authorized session for user " + userID); | 141 | //System.Console.WriteLine("[Authorization]: userserver reported authorized session for user " + userID); |
| 142 | return true; | 142 | return true; |