aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Servers/BaseHttpServer.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs
index 6090d1f..b6776f2 100644
--- a/OpenSim/Framework/Servers/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/BaseHttpServer.cs
@@ -594,8 +594,8 @@ namespace OpenSim.Framework.Servers
594 case "application/xml": 594 case "application/xml":
595 default: 595 default:
596 if (DoWeHaveALLSDHandler(request.RawUrl)) 596 if (DoWeHaveALLSDHandler(request.RawUrl))
597 { 597 {
598 m_log.ErrorFormat("[BASE HTTP SERVER]: Potentially incorrect content type on Registered LLSD CAP: Content Type:{0}", request.ContentType); 598 // Check if we have a LLSD handler here for the EXACT path.
599 HandleLLSDRequests(request, response); 599 HandleLLSDRequests(request, response);
600 600
601 return; 601 return;
@@ -822,7 +822,7 @@ namespace OpenSim.Framework.Servers
822 if (TryGetLLSDHandler(request.RawUrl, out llsdhandler) && !LegacyLLSDLoginLibOMV) 822 if (TryGetLLSDHandler(request.RawUrl, out llsdhandler) && !LegacyLLSDLoginLibOMV)
823 { 823 {
824 // we found a registered llsd handler to service this request 824 // we found a registered llsd handler to service this request
825 llsdResponse = llsdhandler(request.RawUrl, llsdRequest, request.RemoteIPEndPoint.ToString()); 825 llsdResponse = llsdhandler(request.RawUrl, llsdRequest, (request.RemoteIPEndPoint == null)? "" : request.RemoteIPEndPoint.ToString());
826 } 826 }
827 else 827 else
828 { 828 {