aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorDiva Canto2009-09-23 15:40:35 -0700
committerDiva Canto2009-09-23 15:40:35 -0700
commitb8f039897b83a59b723d9c76b796fee5497afbf1 (patch)
tree05a586e6eea1ee4d23a456d0bcf7f00a321585b1 /OpenSim/Framework
parentModules active. Tested HGGridConnector in standalone only for now. Modules co... (diff)
parentFix endlines on UrlModule.cs (diff)
downloadopensim-SC_OLD-b8f039897b83a59b723d9c76b796fee5497afbf1.zip
opensim-SC_OLD-b8f039897b83a59b723d9c76b796fee5497afbf1.tar.gz
opensim-SC_OLD-b8f039897b83a59b723d9c76b796fee5497afbf1.tar.bz2
opensim-SC_OLD-b8f039897b83a59b723d9c76b796fee5497afbf1.tar.xz
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Communications/Services/LoginService.cs5
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Framework/Communications/Services/LoginService.cs b/OpenSim/Framework/Communications/Services/LoginService.cs
index bf59f8e..a6cd918 100644
--- a/OpenSim/Framework/Communications/Services/LoginService.cs
+++ b/OpenSim/Framework/Communications/Services/LoginService.cs
@@ -1221,11 +1221,13 @@ namespace OpenSim.Framework.Communications.Services
1221 { 1221 {
1222 return Util.CreateUnknownUserErrorResponse(); 1222 return Util.CreateUnknownUserErrorResponse();
1223 } 1223 }
1224
1224 UUID.TryParse((string)requestData["session_id"], out guess_sid); 1225 UUID.TryParse((string)requestData["session_id"], out guess_sid);
1225 if (guess_sid == UUID.Zero) 1226 if (guess_sid == UUID.Zero)
1226 { 1227 {
1227 return Util.CreateUnknownUserErrorResponse(); 1228 return Util.CreateUnknownUserErrorResponse();
1228 } 1229 }
1230
1229 if (m_userManager.VerifySession(guess_aid, guess_sid)) 1231 if (m_userManager.VerifySession(guess_aid, guess_sid))
1230 { 1232 {
1231 authed = "TRUE"; 1233 authed = "TRUE";
@@ -1243,6 +1245,5 @@ namespace OpenSim.Framework.Communications.Services
1243 response.Value = responseData; 1245 response.Value = responseData;
1244 return response; 1246 return response;
1245 } 1247 }
1246
1247 } 1248 }
1248} 1249} \ No newline at end of file