aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/prebuild.xml
diff options
context:
space:
mode:
authorMelanie2010-03-04 10:43:12 +0000
committerMelanie2010-03-04 10:43:12 +0000
commit31f7e06c25ba5c195cabd7a79d5fce8cbcec7fca (patch)
treee351c23bd3f773e0ceb4cae518987c73edc90f6d /prebuild.xml
parentRemove a superfluous array creation (diff)
parentcompiler warnings revealed that public PlaySoundSlavePrims properties were ch... (diff)
downloadopensim-SC_OLD-31f7e06c25ba5c195cabd7a79d5fce8cbcec7fca.zip
opensim-SC_OLD-31f7e06c25ba5c195cabd7a79d5fce8cbcec7fca.tar.gz
opensim-SC_OLD-31f7e06c25ba5c195cabd7a79d5fce8cbcec7fca.tar.bz2
opensim-SC_OLD-31f7e06c25ba5c195cabd7a79d5fce8cbcec7fca.tar.xz
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'prebuild.xml')
-rw-r--r--prebuild.xml45
1 files changed, 1 insertions, 44 deletions
diff --git a/prebuild.xml b/prebuild.xml
index e19e636..98a471b 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -157,6 +157,7 @@
157 <Reference name="System.Xml"/> 157 <Reference name="System.Xml"/>
158 <Reference name="System.Data"/> 158 <Reference name="System.Data"/>
159 <Reference name="System.Drawing"/> 159 <Reference name="System.Drawing"/>
160 <Reference name="System.Web"/>
160 <Reference name="BclExtras.dll"/> 161 <Reference name="BclExtras.dll"/>
161 <Reference name="OpenMetaverseTypes.dll"/> 162 <Reference name="OpenMetaverseTypes.dll"/>
162 <Reference name="OpenMetaverse.dll"/> 163 <Reference name="OpenMetaverse.dll"/>
@@ -1539,42 +1540,6 @@
1539 </Files> 1540 </Files>
1540 </Project> 1541 </Project>
1541 1542
1542 <Project frameworkVersion="v3_5" name="OpenSim.Region.Communications.Hypergrid" path="OpenSim/Region/Communications/Hypergrid" type="Library">
1543 <Configuration name="Debug">
1544 <Options>
1545 <OutputPath>../../../../bin/</OutputPath>
1546 </Options>
1547 </Configuration>
1548 <Configuration name="Release">
1549 <Options>
1550 <OutputPath>../../../../bin/</OutputPath>
1551 </Options>
1552 </Configuration>
1553
1554 <ReferencePath>../../../../bin/</ReferencePath>
1555 <Reference name="System"/>
1556 <Reference name="System.Drawing"/>
1557 <Reference name="System.Xml"/>
1558 <Reference name="OpenSim.Data"/>
1559 <Reference name="OpenSim.Framework"/>
1560 <Reference name="OpenSim.Framework.Communications" />
1561 <Reference name="OpenSim.Framework.Servers"/>
1562 <Reference name="OpenSim.Framework.Servers.HttpServer"/>
1563 <Reference name="OpenSim.Framework.Statistics"/>
1564 <Reference name="OpenSim.Region.Communications.Local"/>
1565 <Reference name="OpenSim.Region.Communications.OGS1"/>
1566 <Reference name="OpenSim.Region.Framework"/>
1567 <Reference name="OpenSim.Services.Interfaces"/>
1568 <Reference name="OpenMetaverse.dll"/>
1569 <Reference name="OpenMetaverseTypes.dll"/>
1570 <Reference name="XMLRPC.dll"/>
1571 <Reference name="log4net.dll"/>
1572
1573 <Files>
1574 <Match pattern="*.cs" recurse="true"/>
1575 </Files>
1576 </Project>
1577
1578 <Project frameworkVersion="v3_5" name="OpenSim.Region.ClientStack" path="OpenSim/Region/ClientStack" type="Library"> 1543 <Project frameworkVersion="v3_5" name="OpenSim.Region.ClientStack" path="OpenSim/Region/ClientStack" type="Library">
1579 <Configuration name="Debug"> 1544 <Configuration name="Debug">
1580 <Options> 1545 <Options>
@@ -1599,7 +1564,6 @@
1599 <Reference name="OpenSim.Framework.Console"/> 1564 <Reference name="OpenSim.Framework.Console"/>
1600 <Reference name="OpenSim.Framework.Communications"/> 1565 <Reference name="OpenSim.Framework.Communications"/>
1601 <Reference name="OpenSim.Framework.Statistics"/> 1566 <Reference name="OpenSim.Framework.Statistics"/>
1602 <Reference name="OpenSim.Region.Communications.Local"/>
1603 <Reference name="OpenSim.Region.Physics.Manager"/> 1567 <Reference name="OpenSim.Region.Physics.Manager"/>
1604 <Reference name="OpenSim.Region.CoreModules"/> 1568 <Reference name="OpenSim.Region.CoreModules"/>
1605 <Reference name="XMLRPC.dll"/> 1569 <Reference name="XMLRPC.dll"/>
@@ -1639,7 +1603,6 @@
1639 <Reference name="OpenSim.Framework.Communications"/> 1603 <Reference name="OpenSim.Framework.Communications"/>
1640 <Reference name="OpenSim.Framework.Statistics"/> 1604 <Reference name="OpenSim.Framework.Statistics"/>
1641 <Reference name="OpenSim.Region.ClientStack"/> 1605 <Reference name="OpenSim.Region.ClientStack"/>
1642 <Reference name="OpenSim.Region.Communications.Local"/>
1643 <Reference name="OpenSim.Region.Physics.Manager"/> 1606 <Reference name="OpenSim.Region.Physics.Manager"/>
1644 <Reference name="OpenSim.Services.Interfaces"/> 1607 <Reference name="OpenSim.Services.Interfaces"/>
1645 <Reference name="BclExtras.dll"/> 1608 <Reference name="BclExtras.dll"/>
@@ -1713,10 +1676,7 @@
1713 <Reference name="OpenSim.Region.CoreModules"/> 1676 <Reference name="OpenSim.Region.CoreModules"/>
1714 <Reference name="OpenSim.Region.ClientStack"/> 1677 <Reference name="OpenSim.Region.ClientStack"/>
1715 <Reference name="OpenSim.Framework.Communications"/> 1678 <Reference name="OpenSim.Framework.Communications"/>
1716 <Reference name="OpenSim.Region.Communications.OGS1"/>
1717 <Reference name="XMLRPC.dll"/> 1679 <Reference name="XMLRPC.dll"/>
1718 <Reference name="OpenSim.Region.Communications.Local"/>
1719 <Reference name="OpenSim.Region.Communications.Hypergrid"/>
1720 <Reference name="Nini.dll" /> 1680 <Reference name="Nini.dll" />
1721 <Reference name="log4net.dll"/> 1681 <Reference name="log4net.dll"/>
1722 1682
@@ -2785,7 +2745,6 @@
2785 <Reference name="OpenSim.Data"/> 2745 <Reference name="OpenSim.Data"/>
2786 <Reference name="OpenSim.Services.Interfaces"/> 2746 <Reference name="OpenSim.Services.Interfaces"/>
2787 <Reference name="OpenSim.Server.Base"/> 2747 <Reference name="OpenSim.Server.Base"/>
2788 <Reference name="OpenSim.Region.Communications.Local"/>
2789 <Reference name="OpenSim.Region.Framework"/> 2748 <Reference name="OpenSim.Region.Framework"/>
2790 <Reference name="OpenSim.Region.CoreModules"/> 2749 <Reference name="OpenSim.Region.CoreModules"/>
2791 <Reference name="OpenSim.Region.Physics.Manager"/> 2750 <Reference name="OpenSim.Region.Physics.Manager"/>
@@ -3019,7 +2978,6 @@
3019 <Reference name="OpenSim.Framework.Servers"/> 2978 <Reference name="OpenSim.Framework.Servers"/>
3020 <Reference name="OpenSim.Framework.Servers.HttpServer"/> 2979 <Reference name="OpenSim.Framework.Servers.HttpServer"/>
3021 <Reference name="OpenSim.Framework.Statistics"/> 2980 <Reference name="OpenSim.Framework.Statistics"/>
3022 <Reference name="OpenSim.Region.Communications.Local"/>
3023 <Reference name="OpenSim.Region.Framework"/> 2981 <Reference name="OpenSim.Region.Framework"/>
3024 <Reference name="OpenSim.Region.CoreModules"/> 2982 <Reference name="OpenSim.Region.CoreModules"/>
3025 <Reference name="OpenSim.Region.Physics.Manager"/> 2983 <Reference name="OpenSim.Region.Physics.Manager"/>
@@ -3083,7 +3041,6 @@
3083 <Reference name="OpenSim.Framework.Servers"/> 3041 <Reference name="OpenSim.Framework.Servers"/>
3084 <Reference name="OpenSim.Framework.Statistics"/> 3042 <Reference name="OpenSim.Framework.Statistics"/>
3085 <Reference name="OpenSim.Framework.Servers.HttpServer"/> 3043 <Reference name="OpenSim.Framework.Servers.HttpServer"/>
3086 <Reference name="OpenSim.Region.Communications.Local"/>
3087 <Reference name="OpenSim.Region.Framework"/> 3044 <Reference name="OpenSim.Region.Framework"/>
3088 <Reference name="OpenSim.Region.CoreModules"/> 3045 <Reference name="OpenSim.Region.CoreModules"/>
3089 <Reference name="OpenSim.Region.Physics.Manager"/> 3046 <Reference name="OpenSim.Region.Physics.Manager"/>