From 4f588ad7ba82b018b032041803c51aa3b93fff67 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Thu, 5 May 2011 12:13:56 +0100
Subject: Fix up some paths in prebuild

---
 prebuild.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/prebuild.xml b/prebuild.xml
index cc77436..328abce 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -681,10 +681,10 @@
       <Reference name="OpenSim.Framework.Servers.HttpServer"/>
       <Reference name="OpenSim.Framework.Statistics"/>
       <Reference name="OpenSim.Services.Interfaces"/>
-      <Reference name="OpenMetaverse" path="../../../bin/"/>
-      <Reference name="OpenMetaverseTypes" path="../../../bin/"/>
-      <Reference name="Nini" path="../../../bin/"/>
-      <Reference name="log4net" path="../../../bin/"/>
+      <Reference name="OpenMetaverse" path="../../bin/"/>
+      <Reference name="OpenMetaverseTypes" path="../../bin/"/>
+      <Reference name="Nini" path="../../bin/"/>
+      <Reference name="log4net" path="../../bin/"/>
 
       <Files>
         <Match pattern="*.cs" recurse="false">
-- 
cgit v1.1


From f5bb6edd85776594551dcb35b31384f80e73d36e Mon Sep 17 00:00:00 2001
From: Melanie
Date: Thu, 5 May 2011 13:01:46 +0100
Subject: Squish a warning

---
 OpenSim/Capabilities/Handlers/GetMesh/GetMeshServerConnector.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/OpenSim/Capabilities/Handlers/GetMesh/GetMeshServerConnector.cs b/OpenSim/Capabilities/Handlers/GetMesh/GetMeshServerConnector.cs
index fa5f755..2ecfa3c 100644
--- a/OpenSim/Capabilities/Handlers/GetMesh/GetMeshServerConnector.cs
+++ b/OpenSim/Capabilities/Handlers/GetMesh/GetMeshServerConnector.cs
@@ -33,7 +33,6 @@ using OpenSim.Services.Interfaces;
 using OpenSim.Framework.Servers.HttpServer;
 using OpenSim.Server.Handlers.Base;
 using OpenSim.Framework.Servers;
-using OpenSim.Framework.Servers.HttpServer;
 
 using OpenMetaverse;
 
-- 
cgit v1.1


From 1bdac6ed190466684fd50424908f3ebeaf91699c Mon Sep 17 00:00:00 2001
From: Melanie
Date: Thu, 5 May 2011 13:27:44 +0100
Subject: Fix up nant linux build break

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

diff --git a/prebuild.xml b/prebuild.xml
index 328abce..a07ad14 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -1323,6 +1323,7 @@
       <Reference name="System.Drawing"/>
       <Reference name="System.Xml"/>
       <Reference name="System.Web"/>
+      <Reference name="System.Core"/>
       <Reference name="OpenMetaverse" path="../../../bin/"/>
       <Reference name="OpenMetaverseTypes" path="../../../bin/"/>
       <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/>
@@ -1623,7 +1624,7 @@
       <Reference name="OpenSim.Framework.Console"/>
       <Reference name="OpenSim.Region.Physics.Manager"/>
       <Reference name="OpenSim.Services.Interfaces"/>
-      <Reference name="Mono.Addins" path="../../../../bin/"/>
+      <Reference name="Mono.Addins" path="../../../../../bin/"/>
       <Reference name="Nini" path="../../../../../bin/"/>
       <Reference name="log4net" path="../../../../../bin/"/>
       <Reference name="Nini" path="../../../../../bin/"/>
-- 
cgit v1.1