diff options
author | BlueWall | 2015-03-04 14:02:35 -0500 |
---|---|---|
committer | BlueWall | 2015-03-04 14:02:35 -0500 |
commit | 369ccaf1eb0f2cf235108b6534d4207cfbf520e9 (patch) | |
tree | c916dd429b9a9b494b27fe87563ef31d399c9403 /prebuild.xml | |
parent | One more migration fix (diff) | |
parent | Make private services forbid llHTTPRequest() calls by rejecting those that ha... (diff) | |
download | opensim-SC-369ccaf1eb0f2cf235108b6534d4207cfbf520e9.zip opensim-SC-369ccaf1eb0f2cf235108b6534d4207cfbf520e9.tar.gz opensim-SC-369ccaf1eb0f2cf235108b6534d4207cfbf520e9.tar.bz2 opensim-SC-369ccaf1eb0f2cf235108b6534d4207cfbf520e9.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'prebuild.xml')
-rw-r--r-- | prebuild.xml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/prebuild.xml b/prebuild.xml index 771b7c7..a0b33b6 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
@@ -593,6 +593,7 @@ | |||
593 | 593 | ||
594 | <ReferencePath>../../../bin/</ReferencePath> | 594 | <ReferencePath>../../../bin/</ReferencePath> |
595 | <Reference name="System"/> | 595 | <Reference name="System"/> |
596 | <Reference name="System.Core"/> | ||
596 | <Reference name="System.Xml"/> | 597 | <Reference name="System.Xml"/> |
597 | <Reference name="System.Web"/> | 598 | <Reference name="System.Web"/> |
598 | <Reference name="OpenSim.Data"/> | 599 | <Reference name="OpenSim.Data"/> |
@@ -607,6 +608,7 @@ | |||
607 | <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/> | 608 | <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/> |
608 | <!-- FIXME: The OpenMetaverse.dll reference can be dropped when the TransferRequestPacket reference is removed from the code --> | 609 | <!-- FIXME: The OpenMetaverse.dll reference can be dropped when the TransferRequestPacket reference is removed from the code --> |
609 | <Reference name="OpenMetaverse" path="../../../bin/"/> | 610 | <Reference name="OpenMetaverse" path="../../../bin/"/> |
611 | <Reference name="LukeSkywalker.IPNetwork" path="../../../bin/"/> | ||
610 | <Reference name="Nini" path="../../../bin/"/> | 612 | <Reference name="Nini" path="../../../bin/"/> |
611 | <Reference name="XMLRPC" path="../../../bin/"/> | 613 | <Reference name="XMLRPC" path="../../../bin/"/> |
612 | <Reference name="log4net" path="../../../bin/"/> | 614 | <Reference name="log4net" path="../../../bin/"/> |