From d6f212059e260c497502c8d59762c389a4973706 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sun, 19 Feb 2012 20:17:47 +0100
Subject: Fix merge issues in prebuild
---
prebuild.xml | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/prebuild.xml b/prebuild.xml
index 443c4f8..783bcb4 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -3346,12 +3346,16 @@
<Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/>
<Reference name="XMLRPC" path="../../../bin/"/>
<Reference name="OpenSim.Framework"/>
+ <Reference name="OpenSim.Framework.Communications"/>
<Reference name="OpenSim.Framework.Console"/>
<Reference name="OpenSim.Framework.Servers.HttpServer"/>
<Reference name="OpenSim.Region.CoreModules"/>
<Reference name="OpenSim.Region.Framework"/>
- <Reference name="OpenSim.Region.ScriptEngine.XEngine"/>
+ <Reference name="OpenSim.Region.OptionalModules"/>
<Reference name="OpenSim.Region.ScriptEngine.Shared"/>
+ <Reference name="OpenSim.Region.ScriptEngine.XEngine"/>
+ <Reference name="OpenSim.Services.Interfaces"/>
+ <Reference name="OpenSim.Services.AvatarService"/>
<Reference name="OpenSim.Tests.Common"/>
<Files>
<Match pattern="*.cs" recurse="false"/>
--
cgit v1.1