aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Grid/UserServer.Modules/UserManager.cs2
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1UserServices.cs12
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
109 m_httpServer.AddXmlRPCHandler("get_avatar_picker_avatar", XmlRPCGetAvatarPickerAvatar); 109 m_httpServer.AddXmlRPCHandler("get_avatar_picker_avatar", XmlRPCGetAvatarPickerAvatar);
110 110
111 // Used by IAR module to do password checks 111 // Used by IAR module to do password checks
112 //m_httpServer.AddXmlRPCHandler("authenticate_user_by_password", XmlRPCAuthenticateUserMethodPassword); 112 m_httpServer.AddXmlRPCHandler("authenticate_user_by_password", XmlRPCAuthenticateUserMethodPassword);
113 113
114 m_httpServer.AddXmlRPCHandler("update_user_current_region", XmlRPCAtRegion); 114 m_httpServer.AddXmlRPCHandler("update_user_current_region", XmlRPCAtRegion);
115 m_httpServer.AddXmlRPCHandler("logout_of_simulator", XmlRPCLogOffUserMethodUUID); 115 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
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;