aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/prebuild.xml
diff options
context:
space:
mode:
authorMelanie Thielker2008-11-19 06:15:21 +0000
committerMelanie Thielker2008-11-19 06:15:21 +0000
commit3234472d6203671a492a73042a0b56d6301903e0 (patch)
tree2d4c6ef2b21ee24d315e27564b5426cdfe77e9b3 /prebuild.xml
parentEnsure that the physics representation of a deleted object is also removed (diff)
downloadopensim-SC_OLD-3234472d6203671a492a73042a0b56d6301903e0.zip
opensim-SC_OLD-3234472d6203671a492a73042a0b56d6301903e0.tar.gz
opensim-SC_OLD-3234472d6203671a492a73042a0b56d6301903e0.tar.bz2
opensim-SC_OLD-3234472d6203671a492a73042a0b56d6301903e0.tar.xz
Reverting the texture sending patch and the new libOMV. This makes this
release a direct descendant of the stable 7364, with all the features and none of the issues. This omits the following patch chain: r7383 r7382 r7381 r7377 r7375 r7373 r7372 r7370 r7369 r7368 r7367 r7366
Diffstat (limited to 'prebuild.xml')
-rw-r--r--prebuild.xml14
1 files changed, 5 insertions, 9 deletions
diff --git a/prebuild.xml b/prebuild.xml
index f5467df..9d66e9b 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -461,7 +461,7 @@
461 <Reference name="OpenSim.Framework"/> 461 <Reference name="OpenSim.Framework"/>
462 <Reference name="OpenSim.Framework.Console"/> 462 <Reference name="OpenSim.Framework.Console"/>
463 <Reference name="OpenSim.Framework.Statistics"/> 463 <Reference name="OpenSim.Framework.Statistics"/>
464 <Reference name="OpenMetaverse.StructuredData.dll"/> 464 <Reference name="OpenMetaverse.dll"/>
465 <Reference name="OpenMetaverseTypes.dll"/> 465 <Reference name="OpenMetaverseTypes.dll"/>
466 <Reference name="XMLRPC.dll"/> 466 <Reference name="XMLRPC.dll"/>
467 <Reference name="log4net.dll"/> 467 <Reference name="log4net.dll"/>
@@ -706,7 +706,7 @@
706 <Reference name="System" localCopy="false"/> 706 <Reference name="System" localCopy="false"/>
707 <Reference name="System.Runtime.Remoting"/> 707 <Reference name="System.Runtime.Remoting"/>
708 <Reference name="OpenSim.Framework"/> 708 <Reference name="OpenSim.Framework"/>
709 <Reference name="OpenMetaverse.StructuredData.dll"/> 709 <Reference name="OpenMetaverse.dll"/>
710 <Reference name="OpenMetaverseTypes.dll"/> 710 <Reference name="OpenMetaverseTypes.dll"/>
711 711
712 <Files> 712 <Files>
@@ -739,8 +739,6 @@
739 <Reference name="OpenSim.Framework.Statistics"/> 739 <Reference name="OpenSim.Framework.Statistics"/>
740 <Reference name="OpenSim.Region.Interfaces"/> 740 <Reference name="OpenSim.Region.Interfaces"/>
741 <Reference name="OpenMetaverseTypes.dll"/> 741 <Reference name="OpenMetaverseTypes.dll"/>
742 <Reference name="OpenMetaverse.StructuredData.dll"/>
743 <!-- FIXME: The OpenMetaverse.dll reference can be dropped when the TransferRequestPacket reference is removed from the code -->
744 <Reference name="OpenMetaverse.dll"/> 742 <Reference name="OpenMetaverse.dll"/>
745 <Reference name="Nini.dll" /> 743 <Reference name="Nini.dll" />
746 <Reference name="XMLRPC.dll"/> 744 <Reference name="XMLRPC.dll"/>
@@ -834,7 +832,6 @@
834 <Reference name="System.Runtime.Remoting"/> 832 <Reference name="System.Runtime.Remoting"/>
835 <Reference name="System.Web"/> 833 <Reference name="System.Web"/>
836 <Reference name="OpenMetaverseTypes.dll"/> 834 <Reference name="OpenMetaverseTypes.dll"/>
837 <Reference name="OpenMetaverse.StructuredData.dll"/>
838 <Reference name="OpenMetaverse.dll"/> 835 <Reference name="OpenMetaverse.dll"/>
839 <Reference name="OpenSim.Framework"/> 836 <Reference name="OpenSim.Framework"/>
840 <Reference name="OpenSim.Data" /> 837 <Reference name="OpenSim.Data" />
@@ -1140,7 +1137,6 @@
1140 <Reference name="System.Xml"/> 1137 <Reference name="System.Xml"/>
1141 <Reference name="Mono.Addins.dll" /> 1138 <Reference name="Mono.Addins.dll" />
1142 <Reference name="OpenMetaverseTypes.dll"/> 1139 <Reference name="OpenMetaverseTypes.dll"/>
1143 <Reference name="OpenMetaverse.StructuredData.dll"/>
1144 <Reference name="OpenMetaverse.dll"/> 1140 <Reference name="OpenMetaverse.dll"/>
1145 <Reference name="OpenSim.Framework"/> 1141 <Reference name="OpenSim.Framework"/>
1146 <Reference name="OpenSim.Data"/> 1142 <Reference name="OpenSim.Data"/>
@@ -1946,7 +1942,7 @@
1946 <Reference name="System.Web" localCopy="false"/> 1942 <Reference name="System.Web" localCopy="false"/>
1947 <Reference name="System.Xml" localCopy="false"/> 1943 <Reference name="System.Xml" localCopy="false"/>
1948 <Reference name="OpenMetaverseTypes.dll"/> 1944 <Reference name="OpenMetaverseTypes.dll"/>
1949 <Reference name="OpenMetaverse.StructuredData.dll"/> 1945 <Reference name="OpenMetaverse.dll"/>
1950 <Reference name="OpenSim" /> 1946 <Reference name="OpenSim" />
1951 <Reference name="OpenSim.Framework"/> 1947 <Reference name="OpenSim.Framework"/>
1952 <Reference name="OpenSim.Framework.Communications"/> 1948 <Reference name="OpenSim.Framework.Communications"/>
@@ -1987,7 +1983,7 @@
1987 <Reference name="System.Xml" localCopy="false"/> 1983 <Reference name="System.Xml" localCopy="false"/>
1988 <Reference name="System.Runtime.Remoting" localCopy="false"/> 1984 <Reference name="System.Runtime.Remoting" localCopy="false"/>
1989 <Reference name="OpenMetaverseTypes.dll"/> 1985 <Reference name="OpenMetaverseTypes.dll"/>
1990 <Reference name="OpenMetaverse.StructuredData.dll"/> 1986 <Reference name="OpenMetaverse.dll"/>
1991 <Reference name="RAIL.dll"/> 1987 <Reference name="RAIL.dll"/>
1992 <Reference name="OpenSim.Framework"/> 1988 <Reference name="OpenSim.Framework"/>
1993 <Reference name="OpenSim.Framework.Console"/> 1989 <Reference name="OpenSim.Framework.Console"/>
@@ -2121,7 +2117,7 @@
2121 <Reference name="OpenSim.Framework.Statistics"/> 2117 <Reference name="OpenSim.Framework.Statistics"/>
2122 <Reference name="OpenSim.Grid.Communications.OGS1"/> 2118 <Reference name="OpenSim.Grid.Communications.OGS1"/>
2123 <Reference name="OpenMetaverseTypes.dll"/> 2119 <Reference name="OpenMetaverseTypes.dll"/>
2124 <Reference name="OpenMetaverse.StructuredData.dll"/> 2120 <Reference name="OpenMetaverse.dll"/>
2125 <Reference name="XMLRPC.dll"/> 2121 <Reference name="XMLRPC.dll"/>
2126 <Reference name="log4net.dll"/> 2122 <Reference name="log4net.dll"/>
2127 2123