diff options
author | Justin Clark-Casey (justincc) | 2009-09-24 15:22:47 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2009-09-24 15:22:47 +0100 |
commit | e1abc3d4c49ae4068faf7b8d1dcb220829429757 (patch) | |
tree | 451a155033d38910adb7e00d610c69828d633167 /OpenSim/Region/Communications | |
parent | Produce a different error message if the user service does not have the authe... (diff) | |
download | opensim-SC_OLD-e1abc3d4c49ae4068faf7b8d1dcb220829429757.zip opensim-SC_OLD-e1abc3d4c49ae4068faf7b8d1dcb220829429757.tar.gz opensim-SC_OLD-e1abc3d4c49ae4068faf7b8d1dcb220829429757.tar.bz2 opensim-SC_OLD-e1abc3d4c49ae4068faf7b8d1dcb220829429757.tar.xz |
re-enable registration of user service authentication method I accidentally disabled a few commits ago
load/save iar on a grid should now work, provided that the user service is this revision or newer
Diffstat (limited to 'OpenSim/Region/Communications')
-rw-r--r-- | OpenSim/Region/Communications/OGS1/OGS1UserServices.cs | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs index a55b62e..51ba2e9 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs | |||
@@ -153,8 +153,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
153 | XmlRpcResponse resp = req.Send(m_commsManager.NetworkServersInfo.UserURL, 30000); | 153 | XmlRpcResponse resp = req.Send(m_commsManager.NetworkServersInfo.UserURL, 30000); |
154 | 154 | ||
155 | // Temporary measure to deal with older services | 155 | // Temporary measure to deal with older services |
156 | if (resp.IsFault && resp.FaultCode == XmlRpcErrorCodes.SERVER_ERROR_METHOD) | 156 | if (resp.IsFault && resp.FaultCode == XmlRpcErrorCodes.SERVER_ERROR_METHOD) |
157 | //if ((string)respData["fault_code"] != null && (string)respData["fault_code"] == | ||
158 | { | 157 | { |
159 | throw new Exception( | 158 | throw new Exception( |
160 | String.Format( | 159 | String.Format( |
@@ -164,15 +163,6 @@ namespace OpenSim.Region.Communications.OGS1 | |||
164 | 163 | ||
165 | Hashtable respData = (Hashtable)resp.Value; | 164 | Hashtable respData = (Hashtable)resp.Value; |
166 | 165 | ||
167 | // foreach (object key in respData.Keys) | ||
168 | // { | ||
169 | // Console.WriteLine("respData {0}, {1}", key, respData[key]); | ||
170 | // } | ||
171 | |||
172 | // m_log.DebugFormat( | ||
173 | // "[OGS1 USER SERVICES]: AuthenticatedUserByPassword response for {0} is [{1}]", | ||
174 | // userID, respData["auth_user"]); | ||
175 | |||
176 | if ((string)respData["auth_user"] == "TRUE") | 166 | if ((string)respData["auth_user"] == "TRUE") |
177 | { | 167 | { |
178 | return true; | 168 | return true; |