From 99c7a43ffdb9c3b4dee984f7cd788742c6ee3e53 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Wed, 19 Aug 2009 04:39:02 +0100
Subject: Add rest console support to the user server. Will ask new questions
 at startup. To use, run it normally once, answering the questions, then run
 again with -console=rest. Also now supports -console=basic for a console that
 reads stdin

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

(limited to 'prebuild.xml')

diff --git a/prebuild.xml b/prebuild.xml
index 5e44169..4f110c4 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -1178,6 +1178,7 @@
       <Reference name="OpenMetaverse.StructuredData.dll"/>
       <Reference name="XMLRPC.dll"/>
       <Reference name="log4net.dll"/>
+      <Reference name="Nini.dll"/>
       <Reference name="DotNetOpenId.dll"/>
 
       <Files>
-- 
cgit v1.1


From dd0234f5005127c03760c2b9862ed1672f4a2e91 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Wed, 19 Aug 2009 05:15:25 +0100
Subject: Graft the REST console onto the grid server. Same procedure as with
 the user server.

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

(limited to 'prebuild.xml')

diff --git a/prebuild.xml b/prebuild.xml
index 4f110c4..216a02e 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -911,6 +911,7 @@
       <Reference name="OpenMetaverse.dll"/>
       <Reference name="XMLRPC.dll"/>
       <Reference name="log4net.dll"/>
+      <Reference name="Nini.dll"/>
 
       <Files>
         <Match pattern="*.cs" recurse="true"/>
-- 
cgit v1.1


From 2111c66f89033b3426ceedba6a3ec6ed8fb3363f Mon Sep 17 00:00:00 2001
From: Melanie
Date: Wed, 19 Aug 2009 05:40:23 +0100
Subject: Graft the REST console onto the message server as well. What a dirty
 hack! Works the same as the others.

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

(limited to 'prebuild.xml')

diff --git a/prebuild.xml b/prebuild.xml
index 216a02e..ebe5c62 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -1281,6 +1281,7 @@
       <Reference name="OpenMetaverse.dll"/>
       <Reference name="XMLRPC.dll"/>
       <Reference name="log4net.dll"/>
+      <Reference name="Nini.dll"/>
 
       <Files>
         <Match pattern="*.cs" recurse="true"/>
-- 
cgit v1.1


From b23160a871fe6a28105d39c9602c35cda75efe4a Mon Sep 17 00:00:00 2001
From: Melanie
Date: Thu, 20 Aug 2009 21:45:49 +0100
Subject: Remove the AssetInventory server from core. It has fallen behind both
 upstream and the reference implementation to the point where it is no longer
 usable. It has no known users, and sinnce it doesn't work anymore, it is safe
 to assume that no one has used it in a long time.

---
 prebuild.xml | 122 -----------------------------------------------------------
 1 file changed, 122 deletions(-)

(limited to 'prebuild.xml')

diff --git a/prebuild.xml b/prebuild.xml
index ebe5c62..0cf88c3 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -987,128 +987,6 @@
       </Files>
     </Project>
 
-    <Project frameworkVersion="v3_5" name="OpenSim.Grid.AssetInventoryServer" path="OpenSim/Grid/AssetInventoryServer" 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="System.Xml"/>
-      <Reference name="OpenMetaverseTypes"/>
-      <Reference name="OpenMetaverse.StructuredData"/>
-      <Reference name="OpenSim.Framework"/>
-      <Reference name="OpenSim.Framework.Servers"/>
-      <Reference name="OpenSim.Framework.Servers.HttpServer"/>
-      <Reference name="OpenSim.Framework.Console"/>
-      <Reference name="OpenSim.Framework.AssetLoader.Filesystem"/>
-      <Reference name="Nini.dll" />
-      <Reference name="log4net"/>
-
-      <Files>
-        <Match pattern="*.cs" recurse="false"/>
-      </Files>
-    </Project>
-
-    <Project frameworkVersion="v3_5" name="OpenSim.Grid.AssetInventoryServer.Plugins" path="OpenSim/Grid/AssetInventoryServer/Plugins" type="Library">
-      <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="System.Xml"/>
-      <Reference name="System.Web"/>
-      <Reference name="OpenMetaverseTypes"/>
-      <Reference name="OpenMetaverse.StructuredData"/>
-      <Reference name="OpenSim.Framework"/>
-      <Reference name="OpenSim.Framework.Serialization"/>
-      <Reference name="OpenSim.Framework.Servers"/>
-      <Reference name="OpenSim.Framework.Servers.HttpServer"/>
-      <Reference name="OpenSim.Grid.AssetInventoryServer" />
-      <Reference name="log4net"/>
-
-      <Files>
-        <Match pattern="*.cs" recurse="false" />
-        <Match path="Resources" pattern="*.addin.xml" buildAction="EmbeddedResource" recurse="true" />
-      </Files>
-    </Project>
-
-    <Project frameworkVersion="v3_5" name="OpenSim.Grid.AssetInventoryServer.Plugins.Simple" path="OpenSim/Grid/AssetInventoryServer/Plugins/Simple" type="Library">
-      <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="System.Xml" />
-      <Reference name="OpenMetaverse"/>
-      <Reference name="OpenMetaverseTypes"/>
-      <Reference name="OpenSim.Framework" />
-      <Reference name="OpenSim.Framework.Servers"/>
-      <Reference name="OpenSim.Framework.Servers.HttpServer"/>
-      <Reference name="OpenSim.Grid.AssetInventoryServer" />
-      <Reference name="log4net"/>
-
-      <Files>
-        <Match pattern="*.cs" recurse="false" />
-        <Match path="Resources" pattern="*.addin.xml" buildAction="EmbeddedResource" recurse="true" />
-      </Files>
-    </Project>
-
-    <Project frameworkVersion="v3_5" name="OpenSim.Grid.AssetInventoryServer.Plugins.OpenSim" path="OpenSim/Grid/AssetInventoryServer/Plugins/OpenSim" type="Library">
-      <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="System.Xml" />
-      <Reference name="System.Data" />
-      <Reference name="OpenMetaverseTypes"/>
-      <Reference name="OpenSim.Data" />
-      <Reference name="OpenSim.Framework" />
-      <Reference name="OpenSim.Framework.Communications" />
-      <Reference name="OpenSim.Grid.AssetInventoryServer" />
-      <Reference name="OpenSim.Framework.Servers"/>
-      <Reference name="OpenSim.Framework.Servers.HttpServer"/>
-      <Reference name="log4net"/>
-      <Reference name="Nini.dll" />
-
-      <Files>
-        <Match pattern="*.cs" recurse="false" />
-        <Match path="Resources" pattern="*.addin.xml" buildAction="EmbeddedResource" recurse="true" />
-      </Files>
-    </Project>
-
     <Project frameworkVersion="v3_5" name="OpenSim.Grid.UserServer.Modules" path="OpenSim/Grid/UserServer.Modules" type="Library">
       <Configuration name="Debug">
         <Options>
-- 
cgit v1.1