diff options
author | Teravus Ovares | 2008-09-19 01:36:02 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-09-19 01:36:02 +0000 |
commit | 468b7426c37ec2f431355e07b7eb95baf95967ec (patch) | |
tree | 9853f13d0585f8f957b670727b136ca399c00e48 | |
parent | * Added null exception handler where we couldn't locate a user data record in... (diff) | |
download | opensim-SC-468b7426c37ec2f431355e07b7eb95baf95967ec.zip opensim-SC-468b7426c37ec2f431355e07b7eb95baf95967ec.tar.gz opensim-SC-468b7426c37ec2f431355e07b7eb95baf95967ec.tar.bz2 opensim-SC-468b7426c37ec2f431355e07b7eb95baf95967ec.tar.xz |
* Tweaked handler code to recognize LibOMV's LLSD Login by post content.
* OK for public consumption.
-rw-r--r-- | OpenSim/Framework/Servers/BaseHttpServer.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs index 7bf8a3c..69fc4ad 100644 --- a/OpenSim/Framework/Servers/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/BaseHttpServer.cs | |||
@@ -608,6 +608,8 @@ namespace OpenSim.Framework.Servers | |||
608 | LLSD llsdRequest = null; | 608 | LLSD llsdRequest = null; |
609 | LLSD llsdResponse = null; | 609 | LLSD llsdResponse = null; |
610 | 610 | ||
611 | bool LegacyLLSDLoginLibOMV = (requestBody.Contains("passwd") && requestBody.Contains("mac") && requestBody.Contains("viewer_digest")); | ||
612 | |||
611 | try | 613 | try |
612 | { | 614 | { |
613 | llsdRequest = LLSDParser.DeserializeXml(requestBody); | 615 | llsdRequest = LLSDParser.DeserializeXml(requestBody); |
@@ -622,7 +624,7 @@ namespace OpenSim.Framework.Servers | |||
622 | 624 | ||
623 | LLSDMethod llsdhandler = null; | 625 | LLSDMethod llsdhandler = null; |
624 | 626 | ||
625 | if (TryGetLLSDHandler(request.RawUrl, out llsdhandler)) | 627 | if (TryGetLLSDHandler(request.RawUrl, out llsdhandler) && !LegacyLLSDLoginLibOMV) |
626 | { | 628 | { |
627 | // we found a registered llsd handler to service this request | 629 | // we found a registered llsd handler to service this request |
628 | llsdResponse = llsdhandler(request.RawUrl, llsdRequest, request.RemoteIPEndPoint.ToString()); | 630 | llsdResponse = llsdhandler(request.RawUrl, llsdRequest, request.RemoteIPEndPoint.ToString()); |