Merge branch 'master' into careminster-presence-refactor

author: Melanie 2010-07-31 00:57:50 +0100
committer: Melanie 2010-07-31 00:57:50 +0100
commit: 3302e8ddc4b7a99fc664d3fcc69cb61f9ee60116 (patch)
tree: 87bbf9ba4bf4e4e3b31e00d276dda98f1ecd156e /prebuild.xml
parent: Bannination fixes. Objects in nonpublic parcels were muted by default. Gods (diff)
parent: Slight improvement on previous commit. (diff)
download: opensim-SC_OLD-3302e8ddc4b7a99fc664d3fcc69cb61f9ee60116.zip
opensim-SC_OLD-3302e8ddc4b7a99fc664d3fcc69cb61f9ee60116.tar.gz
opensim-SC_OLD-3302e8ddc4b7a99fc664d3fcc69cb61f9ee60116.tar.bz2
opensim-SC_OLD-3302e8ddc4b7a99fc664d3fcc69cb61f9ee60116.tar.xz
1 files changed, 0 insertions, 76 deletions
diff --git a/prebuild.xml b/prebuild.xml
index 9b81542..41221dc 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -255,58 +255,6 @@
      </Files>
    </Project>
-    <Project frameworkVersion="v3_5" name="OpenSim.Framework.Configuration.XML" path="OpenSim/Framework/Configuration/XML" 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.Xml"/>
-      <Reference name="OpenMetaverseTypes.dll"/>
-      <Reference name="XMLRPC.dll"/>
-      <Reference name="OpenSim.Framework"/>
-      <Reference name="OpenSim.Framework.Console"/>
-      <Reference name="OpenSim.Data"/>
-      <Files>
-        <Match pattern="*.cs" recurse="true"/>
-      </Files>
-    </Project>
-    <Project frameworkVersion="v3_5" name="OpenSim.Framework.Configuration.HTTP" path="OpenSim/Framework/Configuration/HTTP" 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.Xml"/>
-      <Reference name="OpenMetaverseTypes.dll"/>
-      <Reference name="XMLRPC.dll"/>
-      <Reference name="OpenSim.Framework"/>
-      <Reference name="OpenSim.Framework.Console"/>
-      <Reference name="OpenSim.Framework.Configuration.XML"/>
-      <Reference name="OpenSim.Data"/>
-      <Reference name="log4net.dll"/>
-      <Files>
-        <Match pattern="*.cs" recurse="true"/>
-      </Files>
-    </Project>
    <Project frameworkVersion="v3_5" name="OpenSim.Framework.AssetLoader.Filesystem" path="OpenSim/Framework/AssetLoader/Filesystem" type="Library">
      <Configuration name="Debug">
        <Options>
@@ -1449,35 +1397,11 @@
        <Match pattern="*.addin.xml" path="Resources" buildAction="EmbeddedResource" recurse="true"/>
        <Match pattern="*.cs" recurse="true">
          <Exclude name="Tests" pattern="Tests" />
-          <Exclude name="TerrainDefaultEffects" pattern="World/Terrain/DefaultEffects" />
        </Match>
        <Match pattern="*.addin.xml" path="Resources" buildAction="EmbeddedResource" recurse="true"/>
      </Files>
    </Project>
-    <Project frameworkVersion="v3_5" name="OpenSim.Region.CoreModules.World.Terrain.DefaultEffects" path="OpenSim/Region/CoreModules/World/Terrain/DefaultEffects" type="Library">
-      <Configuration name="Debug">
-        <Options>
-          <OutputPath>../../../../../../bin/Terrain/</OutputPath>
-        </Options>
-      </Configuration>
-      <Configuration name="Release">
-        <Options>
-          <OutputPath>../../../../../../bin/Terrain/</OutputPath>
-        </Options>
-      </Configuration>
-      <ReferencePath>../../../../../../bin/</ReferencePath>
-      <Reference name="System"/>
-      <Reference name="OpenSim.Framework"/>
-      <Reference name="OpenSim.Region.Framework"/>
-      <Reference name="OpenSim.Region.CoreModules"/>
-      <Files>
-        <Match pattern="*.cs" recurse="true"/>
-      </Files>
-    </Project>
    <Project frameworkVersion="v3_5" name="OpenSim.Region.OptionalModules" path="OpenSim/Region/OptionalModules" type="Library">
      <Configuration name="Debug">
        <Options>
author	Melanie	2010-07-31 00:57:50 +0100
committer	Melanie	2010-07-31 00:57:50 +0100
commit	3302e8ddc4b7a99fc664d3fcc69cb61f9ee60116 (patch)
tree	87bbf9ba4bf4e4e3b31e00d276dda98f1ecd156e /prebuild.xml
parent	Bannination fixes. Objects in nonpublic parcels were muted by default. Gods (diff)
parent	Slight improvement on previous commit. (diff)
download	opensim-SC_OLD-3302e8ddc4b7a99fc664d3fcc69cb61f9ee60116.zip opensim-SC_OLD-3302e8ddc4b7a99fc664d3fcc69cb61f9ee60116.tar.gz opensim-SC_OLD-3302e8ddc4b7a99fc664d3fcc69cb61f9ee60116.tar.bz2 opensim-SC_OLD-3302e8ddc4b7a99fc664d3fcc69cb61f9ee60116.tar.xz

diff --git a/prebuild.xml b/prebuild.xml index 9b81542..41221dc 100644 --- a/prebuild.xml +++ b/prebuild.xml
@@ -255,58 +255,6 @@
255	</Files>	255	</Files>
256	</Project>	256	</Project>
257		257
258	<Project frameworkVersion="v3_5" name="OpenSim.Framework.Configuration.XML" path="OpenSim/Framework/Configuration/XML" type="Library">
259	<Configuration name="Debug">
260	<Options>
261	<OutputPath>../../../../bin/</OutputPath>
262	</Options>
263	</Configuration>
264	<Configuration name="Release">
265	<Options>
266	<OutputPath>../../../../bin/</OutputPath>
267	</Options>
268	</Configuration>
269
270	<ReferencePath>../../../../bin/</ReferencePath>
271	<Reference name="System"/>
272	<Reference name="System.Xml"/>
273	<Reference name="OpenMetaverseTypes.dll"/>
274	<Reference name="XMLRPC.dll"/>
275	<Reference name="OpenSim.Framework"/>
276	<Reference name="OpenSim.Framework.Console"/>
277	<Reference name="OpenSim.Data"/>
278	<Files>
279	<Match pattern="*.cs" recurse="true"/>
280	</Files>
281	</Project>
282
283	<Project frameworkVersion="v3_5" name="OpenSim.Framework.Configuration.HTTP" path="OpenSim/Framework/Configuration/HTTP" type="Library">
284	<Configuration name="Debug">
285	<Options>
286	<OutputPath>../../../../bin/</OutputPath>
287	</Options>
288	</Configuration>
289	<Configuration name="Release">
290	<Options>
291	<OutputPath>../../../../bin/</OutputPath>
292	</Options>
293	</Configuration>
294
295	<ReferencePath>../../../../bin/</ReferencePath>
296	<Reference name="System"/>
297	<Reference name="System.Xml"/>
298	<Reference name="OpenMetaverseTypes.dll"/>
299	<Reference name="XMLRPC.dll"/>
300	<Reference name="OpenSim.Framework"/>
301	<Reference name="OpenSim.Framework.Console"/>
302	<Reference name="OpenSim.Framework.Configuration.XML"/>
303	<Reference name="OpenSim.Data"/>
304	<Reference name="log4net.dll"/>
305	<Files>
306	<Match pattern="*.cs" recurse="true"/>
307	</Files>
308	</Project>
309
310	<Project frameworkVersion="v3_5" name="OpenSim.Framework.AssetLoader.Filesystem" path="OpenSim/Framework/AssetLoader/Filesystem" type="Library">	258	<Project frameworkVersion="v3_5" name="OpenSim.Framework.AssetLoader.Filesystem" path="OpenSim/Framework/AssetLoader/Filesystem" type="Library">
311	<Configuration name="Debug">	259	<Configuration name="Debug">
312	<Options>	260	<Options>
@@ -1449,35 +1397,11 @@
1449	<Match pattern="*.addin.xml" path="Resources" buildAction="EmbeddedResource" recurse="true"/>	1397	<Match pattern="*.addin.xml" path="Resources" buildAction="EmbeddedResource" recurse="true"/>
1450	<Match pattern="*.cs" recurse="true">	1398	<Match pattern="*.cs" recurse="true">
1451	<Exclude name="Tests" pattern="Tests" />	1399	<Exclude name="Tests" pattern="Tests" />
1452	<Exclude name="TerrainDefaultEffects" pattern="World/Terrain/DefaultEffects" />
1453	</Match>	1400	</Match>
1454	<Match pattern="*.addin.xml" path="Resources" buildAction="EmbeddedResource" recurse="true"/>	1401	<Match pattern="*.addin.xml" path="Resources" buildAction="EmbeddedResource" recurse="true"/>
1455	</Files>	1402	</Files>
1456	</Project>	1403	</Project>
1457		1404
1458	<Project frameworkVersion="v3_5" name="OpenSim.Region.CoreModules.World.Terrain.DefaultEffects" path="OpenSim/Region/CoreModules/World/Terrain/DefaultEffects" type="Library">
1459	<Configuration name="Debug">
1460	<Options>
1461	<OutputPath>../../../../../../bin/Terrain/</OutputPath>
1462	</Options>
1463	</Configuration>
1464	<Configuration name="Release">
1465	<Options>
1466	<OutputPath>../../../../../../bin/Terrain/</OutputPath>
1467	</Options>
1468	</Configuration>
1469
1470	<ReferencePath>../../../../../../bin/</ReferencePath>
1471	<Reference name="System"/>
1472	<Reference name="OpenSim.Framework"/>
1473	<Reference name="OpenSim.Region.Framework"/>
1474	<Reference name="OpenSim.Region.CoreModules"/>
1475	<Files>
1476	<Match pattern="*.cs" recurse="true"/>
1477	</Files>
1478	</Project>
1479
1480
1481	<Project frameworkVersion="v3_5" name="OpenSim.Region.OptionalModules" path="OpenSim/Region/OptionalModules" type="Library">	1405	<Project frameworkVersion="v3_5" name="OpenSim.Region.OptionalModules" path="OpenSim/Region/OptionalModules" type="Library">
1482	<Configuration name="Debug">	1406	<Configuration name="Debug">
1483	<Options>	1407	<Options>