Merge branch 'master' into careminster-presence-refactor

author: Melanie 2011-06-09 02:05:04 +0100
committer: Melanie 2011-06-09 02:05:04 +0100
commit: 326c46ba70cea70ddfe4aef9a6b73edff63e126a (patch)
tree: 5e76347b0d77f58717d8e5e4f3b8787ff01a18d7 /prebuild.xml
parent: Make the last otem in a list created with llCSV2List findable (diff)
parent: Consistency fix on the last commit. (diff)
download: opensim-SC-326c46ba70cea70ddfe4aef9a6b73edff63e126a.zip
opensim-SC-326c46ba70cea70ddfe4aef9a6b73edff63e126a.tar.gz
opensim-SC-326c46ba70cea70ddfe4aef9a6b73edff63e126a.tar.bz2
opensim-SC-326c46ba70cea70ddfe4aef9a6b73edff63e126a.tar.xz
1 files changed, 27 insertions, 1 deletions
diff --git a/prebuild.xml b/prebuild.xml
index a97d34f..feab16e 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -1287,6 +1287,7 @@
      <Reference name="OpenSim.Services.Interfaces"/>
      <Reference name="OpenSim.Services.Base"/>
      <Reference name="OpenSim.Services.AssetService"/>
+      <Reference name="OpenSim.Services.FriendsService"/>
      <Reference name="OpenSim.Services.InventoryService"/>
      <Reference name="OpenSim.Services.Connectors"/>
      <Reference name="OpenSim.Data"/>
@@ -1612,7 +1613,6 @@
      <Reference name="OpenSim.Framework.Statistics"/>
      <Reference name="OpenSim.Region.ClientStack"/>
      <Reference name="OpenSim.Services.Interfaces"/>
-      <Reference name="Mono.Addins" path="../../../../bin/"/>
      <Reference name="Nini" path="../../../../../bin/"/>
      <Reference name="log4net" path="../../../../../bin/"/>
      <Reference name="C5" path="../../../../../bin/"/>
@@ -2676,6 +2676,32 @@
      </Files>
    </Project>
+    <Project frameworkVersion="v3_5" name="OpenSim.Tests.Clients.InstantantMessage" path="OpenSim/Tests/Clients/InstantMessage" 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>
    <!-- Test assemblies -->
    <Project frameworkVersion="v3_5" name="OpenSim.Tests.Common" path="OpenSim/Tests/Common" type="Library">
author	Melanie	2011-06-09 02:05:04 +0100
committer	Melanie	2011-06-09 02:05:04 +0100
commit	326c46ba70cea70ddfe4aef9a6b73edff63e126a (patch)
tree	5e76347b0d77f58717d8e5e4f3b8787ff01a18d7 /prebuild.xml
parent	Make the last otem in a list created with llCSV2List findable (diff)
parent	Consistency fix on the last commit. (diff)
download	opensim-SC-326c46ba70cea70ddfe4aef9a6b73edff63e126a.zip opensim-SC-326c46ba70cea70ddfe4aef9a6b73edff63e126a.tar.gz opensim-SC-326c46ba70cea70ddfe4aef9a6b73edff63e126a.tar.bz2 opensim-SC-326c46ba70cea70ddfe4aef9a6b73edff63e126a.tar.xz

diff --git a/prebuild.xml b/prebuild.xml index a97d34f..feab16e 100644 --- a/prebuild.xml +++ b/prebuild.xml
@@ -1287,6 +1287,7 @@
1287	<Reference name="OpenSim.Services.Interfaces"/>	1287	<Reference name="OpenSim.Services.Interfaces"/>
1288	<Reference name="OpenSim.Services.Base"/>	1288	<Reference name="OpenSim.Services.Base"/>
1289	<Reference name="OpenSim.Services.AssetService"/>	1289	<Reference name="OpenSim.Services.AssetService"/>
		1290	<Reference name="OpenSim.Services.FriendsService"/>
1290	<Reference name="OpenSim.Services.InventoryService"/>	1291	<Reference name="OpenSim.Services.InventoryService"/>
1291	<Reference name="OpenSim.Services.Connectors"/>	1292	<Reference name="OpenSim.Services.Connectors"/>
1292	<Reference name="OpenSim.Data"/>	1293	<Reference name="OpenSim.Data"/>
@@ -1612,7 +1613,6 @@
1612	<Reference name="OpenSim.Framework.Statistics"/>	1613	<Reference name="OpenSim.Framework.Statistics"/>
1613	<Reference name="OpenSim.Region.ClientStack"/>	1614	<Reference name="OpenSim.Region.ClientStack"/>
1614	<Reference name="OpenSim.Services.Interfaces"/>	1615	<Reference name="OpenSim.Services.Interfaces"/>
1615	<Reference name="Mono.Addins" path="../../../../bin/"/>
1616	<Reference name="Nini" path="../../../../../bin/"/>	1616	<Reference name="Nini" path="../../../../../bin/"/>
1617	<Reference name="log4net" path="../../../../../bin/"/>	1617	<Reference name="log4net" path="../../../../../bin/"/>
1618	<Reference name="C5" path="../../../../../bin/"/>	1618	<Reference name="C5" path="../../../../../bin/"/>
@@ -2676,6 +2676,32 @@
2676	</Files>	2676	</Files>
2677	</Project>	2677	</Project>
2678		2678
		2679	<Project frameworkVersion="v3_5" name="OpenSim.Tests.Clients.InstantantMessage" path="OpenSim/Tests/Clients/InstantMessage" type="Exe">
		2680	<Configuration name="Debug">
		2681	<Options>
		2682	<OutputPath>../../../../bin/</OutputPath>
		2683	</Options>
		2684	</Configuration>
		2685	<Configuration name="Release">
		2686	<Options>
		2687	<OutputPath>../../../../bin/</OutputPath>
		2688	</Options>
		2689	</Configuration>
		2690
		2691	<ReferencePath>../../../../bin/</ReferencePath>
		2692	<Reference name="System"/>
		2693	<Reference name="OpenMetaverseTypes" path="../../../../bin/"/>
		2694	<Reference name="OpenMetaverse" path="../../../../bin/"/>
		2695	<Reference name="OpenSim.Framework"/>
		2696	<Reference name="OpenSim.Services.Interfaces"/>
		2697	<Reference name="OpenSim.Services.Connectors"/>
		2698	<Reference name="Nini" path="../../../../bin/"/>
		2699	<Reference name="log4net" path="../../../../bin/"/>
		2700
		2701	<Files>
		2702	<Match pattern="*.cs" recurse="true"/>
		2703	</Files>
		2704	</Project>
2679		2705
2680	<!-- Test assemblies -->	2706	<!-- Test assemblies -->
2681	<Project frameworkVersion="v3_5" name="OpenSim.Tests.Common" path="OpenSim/Tests/Common" type="Library">	2707	<Project frameworkVersion="v3_5" name="OpenSim.Tests.Common" path="OpenSim/Tests/Common" type="Library">