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

2 files changed, 2 insertions, 12 deletions

diff --git a/OpenSim/Grid/UserServer.Modules/UserManager.cs b/OpenSim/Grid/UserServer.Modules/UserManager.cs
index bc19ac8..efbf45e 100644
--- a/OpenSim/Grid/UserServer.Modules/UserManager.cs
+++ b/OpenSim/Grid/UserServer.Modules/UserManager.cs
@@ -109,7 +109,7 @@ namespace OpenSim.Grid.UserServer.Modules
             m_httpServer.AddXmlRPCHandler("get_avatar_picker_avatar", XmlRPCGetAvatarPickerAvatar);
 
             // Used by IAR module to do password checks
-            //m_httpServer.AddXmlRPCHandler("authenticate_user_by_password", XmlRPCAuthenticateUserMethodPassword);
+            m_httpServer.AddXmlRPCHandler("authenticate_user_by_password", XmlRPCAuthenticateUserMethodPassword);
 
             m_httpServer.AddXmlRPCHandler("update_user_current_region", XmlRPCAtRegion);
             m_httpServer.AddXmlRPCHandler("logout_of_simulator", XmlRPCLogOffUserMethodUUID);
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;