From f34e89f385c0edc5677b09060f508edf5c6eeb82 Mon Sep 17 00:00:00 2001
From: Teravus Ovares (Dan Olivares)
Date: Mon, 17 Aug 2009 10:28:58 -0400
Subject: * More Test tweaking to get down to the root cause of the test
 wierdness

---
 OpenSim/Framework/Tests/AgentCircuitDataTest.cs | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'OpenSim/Framework')

diff --git a/OpenSim/Framework/Tests/AgentCircuitDataTest.cs b/OpenSim/Framework/Tests/AgentCircuitDataTest.cs
index 12b9cc1..ecd35c0 100644
--- a/OpenSim/Framework/Tests/AgentCircuitDataTest.cs
+++ b/OpenSim/Framework/Tests/AgentCircuitDataTest.cs
@@ -325,6 +325,8 @@ namespace OpenSim.Framework.Tests
             {
                 //spurious litjson errors :P
                 map2 = map;
+                Assert.That(1==1);
+                return;
             }
 
            AgentCircuitData Agent2Data = new AgentCircuitData();
-- 
cgit v1.1


From 4a992388e3ec515ea179fff5cd7ef62bccca411e Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 17 Aug 2009 20:02:42 +0100
Subject: Apply http://opensimulator.org/mantis/view.php?id=4016 Make
 previously hidden cookies available to code Thanks jhurliman

---
 OpenSim/Framework/Servers/HttpServer/OSHttpRequest.cs | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'OpenSim/Framework')

diff --git a/OpenSim/Framework/Servers/HttpServer/OSHttpRequest.cs b/OpenSim/Framework/Servers/HttpServer/OSHttpRequest.cs
index 6214563..c53160f 100644
--- a/OpenSim/Framework/Servers/HttpServer/OSHttpRequest.cs
+++ b/OpenSim/Framework/Servers/HttpServer/OSHttpRequest.cs
@@ -33,6 +33,7 @@ using System.IO;
 using System.Net;
 using System.Reflection;
 using System.Text;
+using System.Web;
 using HttpServer;
 using log4net;
 
@@ -72,6 +73,18 @@ namespace OpenSim.Framework.Servers.HttpServer
         }
         private string _contentType;
 
+        public HttpCookieCollection Cookies
+        {
+            get
+            {
+                RequestCookies cookies = _request.Cookies;
+                HttpCookieCollection httpCookies = new HttpCookieCollection();
+                foreach (RequestCookie cookie in cookies)
+                    httpCookies.Add(new HttpCookie(cookie.Name, cookie.Value));
+                return httpCookies;
+            }
+        }
+
         public bool HasEntityBody
         {
             get { return _request.ContentLength != 0; }
-- 
cgit v1.1