aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorDiva Canto2009-08-17 13:27:22 -0700
committerDiva Canto2009-08-17 13:27:22 -0700
commit59b4cf2d5bc3077ba9c53b7ccea567537a16aa4e (patch)
treec2e3b45589a756c58c88e85b274719fd3f7e3c5e /OpenSim/Framework
parentBumping the interface number down again, because this *may* not be a breaking... (diff)
parentno-op to poke panda (diff)
downloadopensim-SC_OLD-59b4cf2d5bc3077ba9c53b7ccea567537a16aa4e.zip
opensim-SC_OLD-59b4cf2d5bc3077ba9c53b7ccea567537a16aa4e.tar.gz
opensim-SC_OLD-59b4cf2d5bc3077ba9c53b7ccea567537a16aa4e.tar.bz2
opensim-SC_OLD-59b4cf2d5bc3077ba9c53b7ccea567537a16aa4e.tar.xz
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Servers/HttpServer/OSHttpRequest.cs13
-rw-r--r--OpenSim/Framework/Tests/AgentCircuitDataTest.cs2
2 files changed, 15 insertions, 0 deletions
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;
33using System.Net; 33using System.Net;
34using System.Reflection; 34using System.Reflection;
35using System.Text; 35using System.Text;
36using System.Web;
36using HttpServer; 37using HttpServer;
37using log4net; 38using log4net;
38 39
@@ -72,6 +73,18 @@ namespace OpenSim.Framework.Servers.HttpServer
72 } 73 }
73 private string _contentType; 74 private string _contentType;
74 75
76 public HttpCookieCollection Cookies
77 {
78 get
79 {
80 RequestCookies cookies = _request.Cookies;
81 HttpCookieCollection httpCookies = new HttpCookieCollection();
82 foreach (RequestCookie cookie in cookies)
83 httpCookies.Add(new HttpCookie(cookie.Name, cookie.Value));
84 return httpCookies;
85 }
86 }
87
75 public bool HasEntityBody 88 public bool HasEntityBody
76 { 89 {
77 get { return _request.ContentLength != 0; } 90 get { return _request.ContentLength != 0; }
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
325 { 325 {
326 //spurious litjson errors :P 326 //spurious litjson errors :P
327 map2 = map; 327 map2 = map;
328 Assert.That(1==1);
329 return;
328 } 330 }
329 331
330 AgentCircuitData Agent2Data = new AgentCircuitData(); 332 AgentCircuitData Agent2Data = new AgentCircuitData();