From 522d6261f11ffaf8320c3f0775beb5d0608ce226 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 16 Sep 2011 00:12:12 +0100
Subject: Correctly create a freshly created estate owner's default items and
 avatar entries on standalone if applicable.

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

(limited to 'prebuild.xml')

diff --git a/prebuild.xml b/prebuild.xml
index 392fbdc..91308a4 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -1840,6 +1840,8 @@
       <Reference name="OpenSim.Region.ClientStack"/>
       <Reference name="OpenSim.Framework.Communications"/>
       <Reference name="OpenSim.Server.Base"/>
+      <Reference name="OpenSim.Services.Interfaces"/>
+      <Reference name="OpenSim.Services.UserAccountService"/>
       <Reference name="XMLRPC" path="../../../bin/"/>
       <Reference name="Nini" path="../../../bin/"/>
       <Reference name="log4net" path="../../../bin/"/>
-- 
cgit v1.1


From a00327d0e5f512ccf56e18082c7e7c7366517379 Mon Sep 17 00:00:00 2001
From: justincc
Date: Fri, 16 Sep 2011 19:54:23 +0100
Subject: Fix build errors on Windows by adding missing OpenSim.Services.Base
 reference

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

(limited to 'prebuild.xml')

diff --git a/prebuild.xml b/prebuild.xml
index 91308a4..3aca02d 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -1840,6 +1840,7 @@
       <Reference name="OpenSim.Region.ClientStack"/>
       <Reference name="OpenSim.Framework.Communications"/>
       <Reference name="OpenSim.Server.Base"/>
+      <Reference name="OpenSim.Services.Base"/>
       <Reference name="OpenSim.Services.Interfaces"/>
       <Reference name="OpenSim.Services.UserAccountService"/>
       <Reference name="XMLRPC" path="../../../bin/"/>
-- 
cgit v1.1


From f95033812402aaf31a9f2f66c946165d2d79669f Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 17 Sep 2011 01:09:25 +0100
Subject: Remove old bullet DotNET and X libraries in preparation for BulletS

These weren't working properly anyway.
You will need to rerun prebuild.sh/.bat after this commit, and maybe "nant clean" as well.
---
 prebuild.xml | 56 --------------------------------------------------------
 1 file changed, 56 deletions(-)

(limited to 'prebuild.xml')

diff --git a/prebuild.xml b/prebuild.xml
index 3aca02d..690de5a 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -573,34 +573,6 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.BulletXPlugin" path="OpenSim/Region/Physics/BulletXPlugin" type="Library">
-      <Configuration name="Debug">
-        <Options>
-          <OutputPath>../../../../bin/Physics/</OutputPath>
-        </Options>
-      </Configuration>
-      <Configuration name="Release">
-        <Options>
-          <OutputPath>../../../../bin/Physics/</OutputPath>
-        </Options>
-      </Configuration>
-
-      <ReferencePath>../../../../bin/</ReferencePath>
-      <Reference name="System"/>
-      <Reference name="OpenMetaverseTypes" path="../../../../bin/"/>
-      <Reference name="Nini" path="../../../../bin/"/>
-      <Reference name="OpenSim.Framework"/>
-      <Reference name="OpenSim.Framework.Console"/>
-      <Reference name="OpenSim.Region.Physics.Manager"/>
-      <Reference name="MonoXnaCompactMaths" path="../../../../bin/"/>
-      <Reference name="Modified.XnaDevRu.BulletX" path="../../../../bin/"/>
-      <Reference name="log4net" path="../../../../bin/"/>
-
-      <Files>
-        <Match pattern="*.cs" recurse="true"/>
-      </Files>
-    </Project>
-
     <Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.ConvexDecompositionDotNet" path="OpenSim/Region/Physics/ConvexDecompositionDotNet" type="Library">
       <Configuration name="Debug">
         <Options>
@@ -690,34 +662,6 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.BulletDotNETPlugin" path="OpenSim/Region/Physics/BulletDotNETPlugin" type="Library">
-      <Configuration name="Debug">
-        <Options>
-          <OutputPath>../../../../bin/Physics/</OutputPath>
-        </Options>
-      </Configuration>
-      <Configuration name="Release">
-        <Options>
-          <OutputPath>../../../../bin/Physics/</OutputPath>
-        </Options>
-      </Configuration>
-
-      <ReferencePath>../../../../bin/</ReferencePath>
-      <Reference name="System"/>
-      <Reference name="OpenMetaverseTypes" path="../../../../bin/"/>
-      <Reference name="Nini" path="../../../../bin/"/>
-      <Reference name="OpenSim.Framework"/>
-      <Reference name="OpenSim.Framework.Console"/>
-      <Reference name="OpenSim.Region.Physics.Manager"/>
-      <Reference name="BulletDotNET" path="../../../../bin/"/>
-      <Reference name="nunit.framework" path="../../../../bin/"/>
-      <Reference name="log4net" path="../../../../bin/"/>
-
-      <Files>
-        <Match pattern="*.cs" recurse="true"/>
-      </Files>
-    </Project>
-
     <Project frameworkVersion="v3_5" name="OpenSim.Capabilities" path="OpenSim/Capabilities" type="Library">
       <Configuration name="Debug">
         <Options>
-- 
cgit v1.1