diff options
| author | Melanie | 2012-12-09 21:27:32 +0000 |
|---|---|---|
| committer | Melanie | 2012-12-09 21:27:32 +0000 |
| commit | f30d519bcc1e68deee0d5b3671766ceb39a37018 (patch) | |
| tree | e082cd09c815191377d840b1c2936f5e558e45b0 /prebuild.xml | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Restrict IPresenceData.VerifyAgent (diff) | |
| download | opensim-SC_OLD-f30d519bcc1e68deee0d5b3671766ceb39a37018.zip opensim-SC_OLD-f30d519bcc1e68deee0d5b3671766ceb39a37018.tar.gz opensim-SC_OLD-f30d519bcc1e68deee0d5b3671766ceb39a37018.tar.bz2 opensim-SC_OLD-f30d519bcc1e68deee0d5b3671766ceb39a37018.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'prebuild.xml')
| -rw-r--r-- | prebuild.xml | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/prebuild.xml b/prebuild.xml index 8bf5374..ebf0f1f 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
| @@ -105,6 +105,7 @@ | |||
| 105 | <Reference name="Nini" path="../../bin/"/> | 105 | <Reference name="Nini" path="../../bin/"/> |
| 106 | <Reference name="log4net" path="../../bin/"/> | 106 | <Reference name="log4net" path="../../bin/"/> |
| 107 | <Reference name="Mono.Addins" path="../../bin/"/> | 107 | <Reference name="Mono.Addins" path="../../bin/"/> |
| 108 | <Reference name="Mono.Addins.Setup" path="../../bin/"/> | ||
| 108 | <Reference name="SmartThreadPool"/> | 109 | <Reference name="SmartThreadPool"/> |
| 109 | <Files> | 110 | <Files> |
| 110 | <Match pattern="*.cs" recurse="false"/> | 111 | <Match pattern="*.cs" recurse="false"/> |
| @@ -851,10 +852,14 @@ | |||
| 851 | 852 | ||
| 852 | <ReferencePath>../../../bin/</ReferencePath> | 853 | <ReferencePath>../../../bin/</ReferencePath> |
| 853 | <Reference name="System"/> | 854 | <Reference name="System"/> |
| 855 | <Reference name="System.Core"/> | ||
| 854 | <Reference name="System.Xml"/> | 856 | <Reference name="System.Xml"/> |
| 855 | <Reference name="System.Web"/> | 857 | <Reference name="System.Web"/> |
| 856 | <Reference name="OpenMetaverseTypes" path="../../../bin/"/> | 858 | <Reference name="OpenMetaverseTypes" path="../../../bin/"/> |
| 859 | <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/> | ||
| 857 | <Reference name="OpenMetaverse" path="../../../bin/"/> | 860 | <Reference name="OpenMetaverse" path="../../../bin/"/> |
| 861 | <Reference name="Mono.Addins" path="../../../bin/"/> | ||
| 862 | <Reference name="Mono.Addins.Setup" path="../../../bin/"/> | ||
| 858 | <Reference name="OpenSim.Framework"/> | 863 | <Reference name="OpenSim.Framework"/> |
| 859 | <Reference name="OpenSim.Framework.Console"/> | 864 | <Reference name="OpenSim.Framework.Console"/> |
| 860 | <Reference name="OpenSim.Framework.Servers"/> | 865 | <Reference name="OpenSim.Framework.Servers"/> |
| @@ -977,6 +982,7 @@ | |||
| 977 | <Reference name="OpenMetaverseTypes" path="../../../bin/"/> | 982 | <Reference name="OpenMetaverseTypes" path="../../../bin/"/> |
| 978 | <Reference name="OpenMetaverse" path="../../../bin/"/> | 983 | <Reference name="OpenMetaverse" path="../../../bin/"/> |
| 979 | <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/> | 984 | <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/> |
| 985 | <Reference name="Mono.Addins" path="../../../bin/"/> | ||
| 980 | <Reference name="OpenSim.Data"/> | 986 | <Reference name="OpenSim.Data"/> |
| 981 | <Reference name="OpenSim.Framework"/> | 987 | <Reference name="OpenSim.Framework"/> |
| 982 | <Reference name="OpenSim.Framework.Communications"/> | 988 | <Reference name="OpenSim.Framework.Communications"/> |
| @@ -985,7 +991,6 @@ | |||
| 985 | <Reference name="OpenSim.Server.Base"/> | 991 | <Reference name="OpenSim.Server.Base"/> |
| 986 | <Reference name="OpenSim.Services.Base"/> | 992 | <Reference name="OpenSim.Services.Base"/> |
| 987 | <Reference name="OpenSim.Services.Interfaces"/> | 993 | <Reference name="OpenSim.Services.Interfaces"/> |
| 988 | <Reference name="Mono.Addins" path="../../../bin/"/> | ||
| 989 | <Reference name="Nini" path="../../../bin/"/> | 994 | <Reference name="Nini" path="../../../bin/"/> |
| 990 | <Reference name="log4net" path="../../../bin/"/> | 995 | <Reference name="log4net" path="../../../bin/"/> |
| 991 | <Reference name="XMLRPC" path="../../../bin/"/> | 996 | <Reference name="XMLRPC" path="../../../bin/"/> |
| @@ -1384,6 +1389,7 @@ | |||
| 1384 | <Reference name="Nini" path="../../../bin/"/> | 1389 | <Reference name="Nini" path="../../../bin/"/> |
| 1385 | <Reference name="log4net" path="../../../bin/"/> | 1390 | <Reference name="log4net" path="../../../bin/"/> |
| 1386 | <Reference name="DotNetOpenId" path="../../../bin/"/> | 1391 | <Reference name="DotNetOpenId" path="../../../bin/"/> |
| 1392 | <Reference name="Mono.Addins" path="../../../bin/"/> | ||
| 1387 | 1393 | ||
| 1388 | <Files> | 1394 | <Files> |
| 1389 | <Match pattern="*.cs" recurse="true"> | 1395 | <Match pattern="*.cs" recurse="true"> |
| @@ -1460,6 +1466,8 @@ | |||
| 1460 | <Reference name="OpenSim.Server.Handlers"/> | 1466 | <Reference name="OpenSim.Server.Handlers"/> |
| 1461 | <Reference name="Nini" path="../../bin/"/> | 1467 | <Reference name="Nini" path="../../bin/"/> |
| 1462 | <Reference name="log4net" path="../../bin/"/> | 1468 | <Reference name="log4net" path="../../bin/"/> |
| 1469 | <Reference name="Mono.Addins" path="../../bin/"/> | ||
| 1470 | <Reference name="Mono.Addins.Setup" path="../../bin/"/> | ||
| 1463 | 1471 | ||
| 1464 | <Files> | 1472 | <Files> |
| 1465 | <Match pattern="*.cs" recurse="false"> | 1473 | <Match pattern="*.cs" recurse="false"> |