From e1abc3d4c49ae4068faf7b8d1dcb220829429757 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 24 Sep 2009 15:22:47 +0100
Subject: 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

---
 OpenSim/Region/Communications/OGS1/OGS1UserServices.cs | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

(limited to 'OpenSim/Region/Communications/OGS1')

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
             XmlRpcResponse resp = req.Send(m_commsManager.NetworkServersInfo.UserURL, 30000);                
 
             // Temporary measure to deal with older services
-            if (resp.IsFault && resp.FaultCode == XmlRpcErrorCodes.SERVER_ERROR_METHOD)                
-            //if ((string)respData["fault_code"] != null && (string)respData["fault_code"] == 
+            if (resp.IsFault && resp.FaultCode == XmlRpcErrorCodes.SERVER_ERROR_METHOD)       
             {
                 throw new Exception(
                     String.Format(
@@ -164,15 +163,6 @@ namespace OpenSim.Region.Communications.OGS1
 
             Hashtable respData = (Hashtable)resp.Value;
 
-//                foreach (object key in respData.Keys)
-//                {                   
-//                    Console.WriteLine("respData {0}, {1}", key, respData[key]);
-//                }
-
-//                m_log.DebugFormat(
-//                    "[OGS1 USER SERVICES]: AuthenticatedUserByPassword response for {0} is [{1}]", 
-//                    userID, respData["auth_user"]);
-
             if ((string)respData["auth_user"] == "TRUE")
             {
                 return true;
-- 
cgit v1.1