Fixed prebuild errors that have emerged with the merge

author: Diva Canto 2010-03-03 09:34:51 -0800
committer: Diva Canto 2010-03-03 09:34:51 -0800
commit: d83b86e4bf1f064781723b37534555a74e3e3c03 (patch)
tree: 020f31bacf523218bd064d47203f778a8a034f96 /prebuild.xml
parent: Added empty service URLs upon account creation. (diff)
download: opensim-SC-d83b86e4bf1f064781723b37534555a74e3e3c03.zip
opensim-SC-d83b86e4bf1f064781723b37534555a74e3e3c03.tar.gz
opensim-SC-d83b86e4bf1f064781723b37534555a74e3e3c03.tar.bz2
opensim-SC-d83b86e4bf1f064781723b37534555a74e3e3c03.tar.xz
1 files changed, 0 insertions, 44 deletions
diff --git a/prebuild.xml b/prebuild.xml
index e19e636..09d78e9 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -1539,42 +1539,6 @@
      </Files>
    </Project>
-    <Project frameworkVersion="v3_5" name="OpenSim.Region.Communications.Hypergrid" path="OpenSim/Region/Communications/Hypergrid" type="Library">
-      <Configuration name="Debug">
-        <Options>
-          <OutputPath>../../../../bin/</OutputPath>
-        </Options>
-      </Configuration>
-      <Configuration name="Release">
-        <Options>
-          <OutputPath>../../../../bin/</OutputPath>
-        </Options>
-      </Configuration>
-      <ReferencePath>../../../../bin/</ReferencePath>
-      <Reference name="System"/>
-      <Reference name="System.Drawing"/>
-      <Reference name="System.Xml"/>
-      <Reference name="OpenSim.Data"/>
-      <Reference name="OpenSim.Framework"/>
-      <Reference name="OpenSim.Framework.Communications" />
-      <Reference name="OpenSim.Framework.Servers"/>
-      <Reference name="OpenSim.Framework.Servers.HttpServer"/>
-      <Reference name="OpenSim.Framework.Statistics"/>
-      <Reference name="OpenSim.Region.Communications.Local"/>
-      <Reference name="OpenSim.Region.Communications.OGS1"/>
-      <Reference name="OpenSim.Region.Framework"/>
-      <Reference name="OpenSim.Services.Interfaces"/>
-      <Reference name="OpenMetaverse.dll"/>
-      <Reference name="OpenMetaverseTypes.dll"/>
-      <Reference name="XMLRPC.dll"/>
-      <Reference name="log4net.dll"/>
-      <Files>
-        <Match pattern="*.cs" recurse="true"/>
-      </Files>
-    </Project>
    <Project frameworkVersion="v3_5" name="OpenSim.Region.ClientStack" path="OpenSim/Region/ClientStack" type="Library">
      <Configuration name="Debug">
        <Options>
@@ -1599,7 +1563,6 @@
      <Reference name="OpenSim.Framework.Console"/>
      <Reference name="OpenSim.Framework.Communications"/>
      <Reference name="OpenSim.Framework.Statistics"/>
-      <Reference name="OpenSim.Region.Communications.Local"/>
      <Reference name="OpenSim.Region.Physics.Manager"/>
      <Reference name="OpenSim.Region.CoreModules"/>
      <Reference name="XMLRPC.dll"/>
@@ -1639,7 +1602,6 @@
      <Reference name="OpenSim.Framework.Communications"/>
      <Reference name="OpenSim.Framework.Statistics"/>
      <Reference name="OpenSim.Region.ClientStack"/>
-      <Reference name="OpenSim.Region.Communications.Local"/>
      <Reference name="OpenSim.Region.Physics.Manager"/>
      <Reference name="OpenSim.Services.Interfaces"/>
      <Reference name="BclExtras.dll"/>
@@ -1713,10 +1675,7 @@
      <Reference name="OpenSim.Region.CoreModules"/>
      <Reference name="OpenSim.Region.ClientStack"/>
      <Reference name="OpenSim.Framework.Communications"/>
-      <Reference name="OpenSim.Region.Communications.OGS1"/>
      <Reference name="XMLRPC.dll"/>
-      <Reference name="OpenSim.Region.Communications.Local"/>
-      <Reference name="OpenSim.Region.Communications.Hypergrid"/>
      <Reference name="Nini.dll" />
      <Reference name="log4net.dll"/>
@@ -2785,7 +2744,6 @@
      <Reference name="OpenSim.Data"/>
      <Reference name="OpenSim.Services.Interfaces"/>
      <Reference name="OpenSim.Server.Base"/>
-      <Reference name="OpenSim.Region.Communications.Local"/>
      <Reference name="OpenSim.Region.Framework"/>
      <Reference name="OpenSim.Region.CoreModules"/>
      <Reference name="OpenSim.Region.Physics.Manager"/>
@@ -3019,7 +2977,6 @@
      <Reference name="OpenSim.Framework.Servers"/>
      <Reference name="OpenSim.Framework.Servers.HttpServer"/>
      <Reference name="OpenSim.Framework.Statistics"/>
-      <Reference name="OpenSim.Region.Communications.Local"/>
      <Reference name="OpenSim.Region.Framework"/>
      <Reference name="OpenSim.Region.CoreModules"/>
      <Reference name="OpenSim.Region.Physics.Manager"/>
@@ -3083,7 +3040,6 @@
      <Reference name="OpenSim.Framework.Servers"/>
      <Reference name="OpenSim.Framework.Statistics"/>
      <Reference name="OpenSim.Framework.Servers.HttpServer"/>
-      <Reference name="OpenSim.Region.Communications.Local"/>
      <Reference name="OpenSim.Region.Framework"/>
      <Reference name="OpenSim.Region.CoreModules"/>
      <Reference name="OpenSim.Region.Physics.Manager"/>
author	Diva Canto	2010-03-03 09:34:51 -0800
committer	Diva Canto	2010-03-03 09:34:51 -0800
commit	d83b86e4bf1f064781723b37534555a74e3e3c03 (patch)
tree	020f31bacf523218bd064d47203f778a8a034f96 /prebuild.xml
parent	Added empty service URLs upon account creation. (diff)
download	opensim-SC-d83b86e4bf1f064781723b37534555a74e3e3c03.zip opensim-SC-d83b86e4bf1f064781723b37534555a74e3e3c03.tar.gz opensim-SC-d83b86e4bf1f064781723b37534555a74e3e3c03.tar.bz2 opensim-SC-d83b86e4bf1f064781723b37534555a74e3e3c03.tar.xz

diff --git a/prebuild.xml b/prebuild.xml index e19e636..09d78e9 100644 --- a/prebuild.xml +++ b/prebuild.xml
@@ -1539,42 +1539,6 @@
1539	</Files>	1539	</Files>
1540	</Project>	1540	</Project>
1541		1541
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">	1542	<Project frameworkVersion="v3_5" name="OpenSim.Region.ClientStack" path="OpenSim/Region/ClientStack" type="Library">
1579	<Configuration name="Debug">	1543	<Configuration name="Debug">
1580	<Options>	1544	<Options>
@@ -1599,7 +1563,6 @@
1599	<Reference name="OpenSim.Framework.Console"/>	1563	<Reference name="OpenSim.Framework.Console"/>
1600	<Reference name="OpenSim.Framework.Communications"/>	1564	<Reference name="OpenSim.Framework.Communications"/>
1601	<Reference name="OpenSim.Framework.Statistics"/>	1565	<Reference name="OpenSim.Framework.Statistics"/>
1602	<Reference name="OpenSim.Region.Communications.Local"/>
1603	<Reference name="OpenSim.Region.Physics.Manager"/>	1566	<Reference name="OpenSim.Region.Physics.Manager"/>
1604	<Reference name="OpenSim.Region.CoreModules"/>	1567	<Reference name="OpenSim.Region.CoreModules"/>
1605	<Reference name="XMLRPC.dll"/>	1568	<Reference name="XMLRPC.dll"/>
@@ -1639,7 +1602,6 @@
1639	<Reference name="OpenSim.Framework.Communications"/>	1602	<Reference name="OpenSim.Framework.Communications"/>
1640	<Reference name="OpenSim.Framework.Statistics"/>	1603	<Reference name="OpenSim.Framework.Statistics"/>
1641	<Reference name="OpenSim.Region.ClientStack"/>	1604	<Reference name="OpenSim.Region.ClientStack"/>
1642	<Reference name="OpenSim.Region.Communications.Local"/>
1643	<Reference name="OpenSim.Region.Physics.Manager"/>	1605	<Reference name="OpenSim.Region.Physics.Manager"/>
1644	<Reference name="OpenSim.Services.Interfaces"/>	1606	<Reference name="OpenSim.Services.Interfaces"/>
1645	<Reference name="BclExtras.dll"/>	1607	<Reference name="BclExtras.dll"/>
@@ -1713,10 +1675,7 @@
1713	<Reference name="OpenSim.Region.CoreModules"/>	1675	<Reference name="OpenSim.Region.CoreModules"/>
1714	<Reference name="OpenSim.Region.ClientStack"/>	1676	<Reference name="OpenSim.Region.ClientStack"/>
1715	<Reference name="OpenSim.Framework.Communications"/>	1677	<Reference name="OpenSim.Framework.Communications"/>
1716	<Reference name="OpenSim.Region.Communications.OGS1"/>
1717	<Reference name="XMLRPC.dll"/>	1678	<Reference name="XMLRPC.dll"/>
1718	<Reference name="OpenSim.Region.Communications.Local"/>
1719	<Reference name="OpenSim.Region.Communications.Hypergrid"/>
1720	<Reference name="Nini.dll" />	1679	<Reference name="Nini.dll" />
1721	<Reference name="log4net.dll"/>	1680	<Reference name="log4net.dll"/>
1722		1681
@@ -2785,7 +2744,6 @@
2785	<Reference name="OpenSim.Data"/>	2744	<Reference name="OpenSim.Data"/>
2786	<Reference name="OpenSim.Services.Interfaces"/>	2745	<Reference name="OpenSim.Services.Interfaces"/>
2787	<Reference name="OpenSim.Server.Base"/>	2746	<Reference name="OpenSim.Server.Base"/>
2788	<Reference name="OpenSim.Region.Communications.Local"/>
2789	<Reference name="OpenSim.Region.Framework"/>	2747	<Reference name="OpenSim.Region.Framework"/>
2790	<Reference name="OpenSim.Region.CoreModules"/>	2748	<Reference name="OpenSim.Region.CoreModules"/>
2791	<Reference name="OpenSim.Region.Physics.Manager"/>	2749	<Reference name="OpenSim.Region.Physics.Manager"/>
@@ -3019,7 +2977,6 @@
3019	<Reference name="OpenSim.Framework.Servers"/>	2977	<Reference name="OpenSim.Framework.Servers"/>
3020	<Reference name="OpenSim.Framework.Servers.HttpServer"/>	2978	<Reference name="OpenSim.Framework.Servers.HttpServer"/>
3021	<Reference name="OpenSim.Framework.Statistics"/>	2979	<Reference name="OpenSim.Framework.Statistics"/>
3022	<Reference name="OpenSim.Region.Communications.Local"/>
3023	<Reference name="OpenSim.Region.Framework"/>	2980	<Reference name="OpenSim.Region.Framework"/>
3024	<Reference name="OpenSim.Region.CoreModules"/>	2981	<Reference name="OpenSim.Region.CoreModules"/>
3025	<Reference name="OpenSim.Region.Physics.Manager"/>	2982	<Reference name="OpenSim.Region.Physics.Manager"/>
@@ -3083,7 +3040,6 @@
3083	<Reference name="OpenSim.Framework.Servers"/>	3040	<Reference name="OpenSim.Framework.Servers"/>
3084	<Reference name="OpenSim.Framework.Statistics"/>	3041	<Reference name="OpenSim.Framework.Statistics"/>
3085	<Reference name="OpenSim.Framework.Servers.HttpServer"/>	3042	<Reference name="OpenSim.Framework.Servers.HttpServer"/>
3086	<Reference name="OpenSim.Region.Communications.Local"/>
3087	<Reference name="OpenSim.Region.Framework"/>	3043	<Reference name="OpenSim.Region.Framework"/>
3088	<Reference name="OpenSim.Region.CoreModules"/>	3044	<Reference name="OpenSim.Region.CoreModules"/>
3089	<Reference name="OpenSim.Region.Physics.Manager"/>	3045	<Reference name="OpenSim.Region.Physics.Manager"/>