Merge branch 'master' into careminster-presence-refactor

author: Melanie 2010-11-16 21:15:15 +0000
committer: Melanie 2010-11-16 21:15:15 +0000
commit: c4eb430ad2c6f9bbd3f1734d883954f4d5b1b6fd (patch)
tree: 65fd5c2fc7e5b7e4cc4e48280d20e12ed84be320 /prebuild.xml
parent: Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff)
parent: Change the way attachments are persisted. Editing a worn attachment will now (diff)
download: opensim-SC_OLD-c4eb430ad2c6f9bbd3f1734d883954f4d5b1b6fd.zip
opensim-SC_OLD-c4eb430ad2c6f9bbd3f1734d883954f4d5b1b6fd.tar.gz
opensim-SC_OLD-c4eb430ad2c6f9bbd3f1734d883954f4d5b1b6fd.tar.bz2
opensim-SC_OLD-c4eb430ad2c6f9bbd3f1734d883954f4d5b1b6fd.tar.xz
1 files changed, 2 insertions, 2 deletions
diff --git a/prebuild.xml b/prebuild.xml
index c3a58f4..f963bb4 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -2185,7 +2185,7 @@
      <Reference name="OpenSim.Region.Framework"/>
      <Reference name="OpenMetaverseTypes" path="../../../bin/"/>
      <Reference name="OpenMetaverse" path="../../../bin/"/>
-      <Reference name="Mono.Data.SqliteClient"/>
+      <Reference name="Mono.Data.SqliteClient" path="../../../bin/"/>
      <Reference name="Mono.Addins" path="../../../bin/"/>
      <Reference name="log4net" path="../../../bin/"/>
@@ -2534,7 +2534,7 @@
      <Reference name="OpenSim.Framework.Servers.HttpServer"/>
      <Reference name="OpenSim.Framework.Statistics"/>
      <Reference name="OpenSim.Region.Physics.Manager"/>
-      <Reference name="Mono.Data.SqliteClient"/>
+      <Reference name="Mono.Data.SqliteClient" path="../../../bin/"/>
      <Reference name="Mono.Addins"/>
      <!-- For scripting in funny languages by default -->
author	Melanie	2010-11-16 21:15:15 +0000
committer	Melanie	2010-11-16 21:15:15 +0000
commit	c4eb430ad2c6f9bbd3f1734d883954f4d5b1b6fd (patch)
tree	65fd5c2fc7e5b7e4cc4e48280d20e12ed84be320 /prebuild.xml
parent	Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff)
parent	Change the way attachments are persisted. Editing a worn attachment will now (diff)
download	opensim-SC_OLD-c4eb430ad2c6f9bbd3f1734d883954f4d5b1b6fd.zip opensim-SC_OLD-c4eb430ad2c6f9bbd3f1734d883954f4d5b1b6fd.tar.gz opensim-SC_OLD-c4eb430ad2c6f9bbd3f1734d883954f4d5b1b6fd.tar.bz2 opensim-SC_OLD-c4eb430ad2c6f9bbd3f1734d883954f4d5b1b6fd.tar.xz

diff --git a/prebuild.xml b/prebuild.xml index c3a58f4..f963bb4 100644 --- a/prebuild.xml +++ b/prebuild.xml
@@ -2185,7 +2185,7 @@
2185	<Reference name="OpenSim.Region.Framework"/>	2185	<Reference name="OpenSim.Region.Framework"/>
2186	<Reference name="OpenMetaverseTypes" path="../../../bin/"/>	2186	<Reference name="OpenMetaverseTypes" path="../../../bin/"/>
2187	<Reference name="OpenMetaverse" path="../../../bin/"/>	2187	<Reference name="OpenMetaverse" path="../../../bin/"/>
2188	<Reference name="Mono.Data.SqliteClient"/>	2188	<Reference name="Mono.Data.SqliteClient" path="../../../bin/"/>
2189	<Reference name="Mono.Addins" path="../../../bin/"/>	2189	<Reference name="Mono.Addins" path="../../../bin/"/>
2190	<Reference name="log4net" path="../../../bin/"/>	2190	<Reference name="log4net" path="../../../bin/"/>
2191		2191
@@ -2534,7 +2534,7 @@
2534	<Reference name="OpenSim.Framework.Servers.HttpServer"/>	2534	<Reference name="OpenSim.Framework.Servers.HttpServer"/>
2535	<Reference name="OpenSim.Framework.Statistics"/>	2535	<Reference name="OpenSim.Framework.Statistics"/>
2536	<Reference name="OpenSim.Region.Physics.Manager"/>	2536	<Reference name="OpenSim.Region.Physics.Manager"/>
2537	<Reference name="Mono.Data.SqliteClient"/>	2537	<Reference name="Mono.Data.SqliteClient" path="../../../bin/"/>
2538	<Reference name="Mono.Addins"/>	2538	<Reference name="Mono.Addins"/>
2539		2539
2540	<!-- For scripting in funny languages by default -->	2540	<!-- For scripting in funny languages by default -->