From a44ad0149213887b284b3fe65b9bddb0b63abff6 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 6 Jul 2013 00:32:11 +0100
Subject: Fix build break from recent commit dd15f95 on windows

---
 prebuild.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'prebuild.xml')

diff --git a/prebuild.xml b/prebuild.xml
index 3337894..74cfcb0 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -2965,6 +2965,7 @@
       <Reference name="OpenMetaverseTypes" path="../../../bin/"/>
       <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/>
       <Reference name="XMLRPC" path="../../../bin/"/>
+      <Reference name="OpenSim.Capabilities"/>
       <Reference name="OpenSim.Framework.Console"/>
       <Reference name="OpenSim.Framework"/>
       <Reference name="OpenSim.Framework.Servers.HttpServer"/>
-- 
cgit v1.1


From ccceb6d6d2d2359797b78b78f8057b57a6cd8bb4 Mon Sep 17 00:00:00 2001
From: justincc
Date: Sat, 6 Jul 2013 00:52:54 +0100
Subject: Fix windows build break fromrecent dd1f95 for real this time - put
 new dll reference in the wrong place

---
 prebuild.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'prebuild.xml')

diff --git a/prebuild.xml b/prebuild.xml
index 74cfcb0..d9e32ea 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -2965,7 +2965,6 @@
       <Reference name="OpenMetaverseTypes" path="../../../bin/"/>
       <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/>
       <Reference name="XMLRPC" path="../../../bin/"/>
-      <Reference name="OpenSim.Capabilities"/>
       <Reference name="OpenSim.Framework.Console"/>
       <Reference name="OpenSim.Framework"/>
       <Reference name="OpenSim.Framework.Servers.HttpServer"/>
@@ -3197,6 +3196,7 @@
       <Reference name="System.Runtime.Remoting"/>
       <Reference name="OpenMetaverseTypes" path="../../../bin/"/>
       <Reference name="OpenMetaverse" path="../../../bin/"/>
+      <Reference name="OpenSim.Capabilities"/>
       <Reference name="OpenSim.Data"/>
       <Reference name="OpenSim.Framework"/>
       <Reference name="OpenSim.Framework.Communications"/>
-- 
cgit v1.1


From 51d106cff88334e1b9eb3628f7bdb8d6a18af4f6 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 11 Jul 2013 14:21:57 -0700
Subject: Added a test for the asset service

---
 prebuild.xml | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

(limited to 'prebuild.xml')

diff --git a/prebuild.xml b/prebuild.xml
index d9e32ea..c7463e4 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -2631,6 +2631,33 @@
     </Project>
 
     <!-- Test Clients -->
+    <Project frameworkVersion="v3_5" name="OpenSim.Tests.Clients.AssetClient" path="OpenSim/Tests/Clients/Assets" type="Exe">
+      <Configuration name="Debug">
+        <Options>
+          <OutputPath>../../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+      <Configuration name="Release">
+        <Options>
+          <OutputPath>../../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+
+      <ReferencePath>../../../../bin/</ReferencePath>
+      <Reference name="System"/>
+      <Reference name="OpenMetaverseTypes" path="../../../../bin/"/>
+      <Reference name="OpenMetaverse" path="../../../../bin/"/>
+      <Reference name="OpenSim.Framework"/>
+      <Reference name="OpenSim.Services.Interfaces"/>
+      <Reference name="OpenSim.Services.Connectors"/>
+      <Reference name="Nini" path="../../../../bin/"/>
+      <Reference name="log4net" path="../../../../bin/"/>
+
+      <Files>
+        <Match pattern="*.cs" recurse="true"/>
+      </Files>
+    </Project>
+
     <Project frameworkVersion="v3_5" name="OpenSim.Tests.Clients.GridClient" path="OpenSim/Tests/Clients/Grid" type="Exe">
       <Configuration name="Debug">
         <Options>
-- 
cgit v1.1


From 44e9849ed1190dbc29ffa97fa5df286dc9794edb Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 11 Jul 2013 23:02:30 +0100
Subject: Fix regression where llHTTPRequests which did not get an OK response
 returned 499 and the exception message in the http_response event rather than
 the actual response code and body.

This was a regression since commit 831e4c3 (Thu Apr 4 00:36:15 2013)
This commit also adds a regression test for this case, though this currently only works with Mono
This aims to address http://opensimulator.org/mantis/view.php?id=6704
---
 prebuild.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'prebuild.xml')

diff --git a/prebuild.xml b/prebuild.xml
index d9e32ea..d32287a 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -3102,6 +3102,7 @@
         <Match path="Avatar/Inventory/Transfer/Tests" pattern="*.cs" recurse="true"/>
         <Match path="Framework/InventoryAccess/Tests" pattern="*.cs" recurse="true"/>
         <Match path="Framework/UserManagement/Tests" pattern="*.cs" recurse="true"/>
+        <Match path="Scripting/HttpRequest/Tests" pattern="*.cs" recurse="true"/>
         <Match path="Scripting/VectorRender/Tests" pattern="*.cs" recurse="true"/>
         <Match path="World/Archiver/Tests" pattern="*.cs" recurse="true"/>
         <Match buildAction="EmbeddedResource" path="World/Archiver/Tests/Resources" pattern="*"/>
-- 
cgit v1.1