From 3d736d575ff9670ac813f13eb1cff07dea10328b Mon Sep 17 00:00:00 2001
From: Mic Bowman
Date: Wed, 29 Aug 2012 14:56:51 -0700
Subject: This partially implements the LSL function to set the response type
 for an HTTP request. Since the "official" LSL function limits the use of the
 response type, it is implemented as osSetContentType with a string for the
 content mime type and a threat level of high. With this function you should
 be able to implement rather functional media-on-a-prim application with much
 less difficulty.

---
 .../CoreModules/Scripting/LSLHttp/UrlModule.cs       | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region/CoreModules')

diff --git a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
index 05d54f0..53a9679 100644
--- a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
@@ -84,6 +84,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
         public string body;
         public int responseCode;
         public string responseBody;
+        public string responseType = "text/plain";
         //public ManualResetEvent ev;
         public bool requestDone;
         public int startTime;
@@ -302,6 +303,22 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
             }
         }
         
+        public void HttpContentType(UUID request, string type)
+        {
+            lock (m_UrlMap)
+            {
+                if (m_RequestMap.ContainsKey(request))
+                {
+                    UrlData urlData = m_RequestMap[request];
+                    urlData.requests[request].responseType = type;
+                }
+                else
+                {
+                    m_log.Info("[HttpRequestHandler] There is no http-in request with id " + request.ToString());
+                }
+            }
+        }
+        
         public void HttpResponse(UUID request, int status, string body)
         {
             lock (m_UrlMap)
@@ -504,7 +521,8 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
                 //put response
                 response["int_response_code"] = requestData.responseCode;
                 response["str_response_string"] = requestData.responseBody;
-                response["content_type"] = "text/plain";
+                response["content_type"] = requestData.responseType;
+                // response["content_type"] = "text/plain";
                 response["keepalive"] = false;
                 response["reusecontext"] = false;
 
-- 
cgit v1.1