diff options
author | Melanie | 2010-10-16 02:27:51 +0100 |
---|---|---|
committer | Melanie | 2010-10-16 02:27:51 +0100 |
commit | 455a2ba7ded01ffce92bf54cb3e11e73ae086e22 (patch) | |
tree | 9d695e2b8108b3b626ade78c3e65b654076e2074 /prebuild.xml | |
parent | Add a setter to OldItemID so it can be deserialized (diff) | |
parent | Adding projected light filters to prim propeties (diff) | |
download | opensim-SC-455a2ba7ded01ffce92bf54cb3e11e73ae086e22.zip opensim-SC-455a2ba7ded01ffce92bf54cb3e11e73ae086e22.tar.gz opensim-SC-455a2ba7ded01ffce92bf54cb3e11e73ae086e22.tar.bz2 opensim-SC-455a2ba7ded01ffce92bf54cb3e11e73ae086e22.tar.xz |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'prebuild.xml')
-rw-r--r-- | prebuild.xml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/prebuild.xml b/prebuild.xml index 57405da..9c4add9 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
@@ -617,9 +617,11 @@ | |||
617 | <ReferencePath>../../../../bin/</ReferencePath> | 617 | <ReferencePath>../../../../bin/</ReferencePath> |
618 | <Reference name="System"/> | 618 | <Reference name="System"/> |
619 | <Reference name="System.Drawing"/> | 619 | <Reference name="System.Drawing"/> |
620 | <Reference name="System.IO.Compression;"/> | ||
620 | <Reference name="CSJ2K" path="../../../../bin/"/> | 621 | <Reference name="CSJ2K" path="../../../../bin/"/> |
621 | <Reference name="OpenMetaverseTypes" path="../../../../bin/"/> | 622 | <Reference name="OpenMetaverseTypes" path="../../../../bin/"/> |
622 | <Reference name="OpenMetaverse" path="../../../../bin/"/> | 623 | <Reference name="OpenMetaverse" path="../../../../bin/"/> |
624 | <Reference name="OpenMetaverse.StructuredData" path="../../../../bin/"/> | ||
623 | <Reference name="Nini" path="../../../../bin/"/> | 625 | <Reference name="Nini" path="../../../../bin/"/> |
624 | <Reference name="OpenSim.Framework"/> | 626 | <Reference name="OpenSim.Framework"/> |
625 | <Reference name="OpenSim.Framework.Console"/> | 627 | <Reference name="OpenSim.Framework.Console"/> |
@@ -709,6 +711,7 @@ | |||
709 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | 711 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> |
710 | <Reference name="OpenSim.Framework.Statistics"/> | 712 | <Reference name="OpenSim.Framework.Statistics"/> |
711 | <Reference name="OpenSim.Services.Interfaces"/> | 713 | <Reference name="OpenSim.Services.Interfaces"/> |
714 | <Reference name="OpenMetaverse" path="../../../bin/"/> | ||
712 | <Reference name="OpenMetaverseTypes" path="../../../bin/"/> | 715 | <Reference name="OpenMetaverseTypes" path="../../../bin/"/> |
713 | <!-- FIXME: The OpenMetaverse.dll reference can be dropped when the TransferRequestPacket reference is removed from the code --> | 716 | <!-- FIXME: The OpenMetaverse.dll reference can be dropped when the TransferRequestPacket reference is removed from the code --> |
714 | <Reference name="Nini" path="../../../bin/"/> | 717 | <Reference name="Nini" path="../../../bin/"/> |