aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorlbsa712008-11-28 12:31:30 +0000
committerlbsa712008-11-28 12:31:30 +0000
commit27d9e715c02451b4c87ce94728a0fa00071c61e5 (patch)
tree683c852c2429bf44a031ed821a4b4552d55303ce /OpenSim
parentCorrect wrong inverted logic on settings goup (diff)
downloadopensim-SC_OLD-27d9e715c02451b4c87ce94728a0fa00071c61e5.zip
opensim-SC_OLD-27d9e715c02451b4c87ce94728a0fa00071c61e5.tar.gz
opensim-SC_OLD-27d9e715c02451b4c87ce94728a0fa00071c61e5.tar.bz2
opensim-SC_OLD-27d9e715c02451b4c87ce94728a0fa00071c61e5.tar.xz
* Changed name of auth function to better reflect actual use
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/Communications/LoginService.cs5
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs
index d6d0e27..883f965 100644
--- a/OpenSim/Framework/Communications/LoginService.cs
+++ b/OpenSim/Framework/Communications/LoginService.cs
@@ -152,7 +152,7 @@ namespace OpenSim.Framework.Communications
152 m_log.DebugFormat( 152 m_log.DebugFormat(
153 "[LOGIN]: XMLRPC Client is {0}, start location is {1}", clientVersion, startLocationRequest); 153 "[LOGIN]: XMLRPC Client is {0}, start location is {1}", clientVersion, startLocationRequest);
154 154
155 if (!TryAuthenticateUser(request, firstname, lastname, out userProfile)) 155 if( !TryAuthenticateXmlRpcLogin(request, firstname, lastname, out userProfile ) )
156 { 156 {
157 return logResponse.CreateLoginFailedResponse(); 157 return logResponse.CreateLoginFailedResponse();
158 } 158 }
@@ -193,6 +193,7 @@ namespace OpenSim.Framework.Communications
193 193
194 return logResponse.CreateAlreadyLoggedInResponse(); 194 return logResponse.CreateAlreadyLoggedInResponse();
195 } 195 }
196
196 // Otherwise... 197 // Otherwise...
197 // Create a new agent session 198 // Create a new agent session
198 199
@@ -285,7 +286,7 @@ namespace OpenSim.Framework.Communications
285 } 286 }
286 } 287 }
287 288
288 protected virtual bool TryAuthenticateUser(XmlRpcRequest request, string firstname, string lastname, out UserProfileData userProfile) 289 protected virtual bool TryAuthenticateXmlRpcLogin(XmlRpcRequest request, string firstname, string lastname, out UserProfileData userProfile)
289 { 290 {
290 Hashtable requestData = (Hashtable)request.Params[0]; 291 Hashtable requestData = (Hashtable)request.Params[0];
291 292