aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-07-30 20:34:14 +0100
committerJustin Clark-Casey (justincc)2010-07-30 20:34:14 +0100
commitc6bc1d28ecce5d2f7da57c396e0b964b3a750719 (patch)
tree5326e894369dfe5cdda2529fa1ca46fdb5417801
parentremove long unused OpenSim/Framework/Configuration/* projects (diff)
downloadopensim-SC_OLD-c6bc1d28ecce5d2f7da57c396e0b964b3a750719.zip
opensim-SC_OLD-c6bc1d28ecce5d2f7da57c396e0b964b3a750719.tar.gz
opensim-SC_OLD-c6bc1d28ecce5d2f7da57c396e0b964b3a750719.tar.bz2
opensim-SC_OLD-c6bc1d28ecce5d2f7da57c396e0b964b3a750719.tar.xz
move ChannelDigger from its own project into the main terrain module with the rest of the effects
-rw-r--r--OpenSim/Region/CoreModules/World/Terrain/Effects/ChannelDigger.cs (renamed from OpenSim/Region/CoreModules/World/Terrain/DefaultEffects/ChannelDigger.cs)2
-rw-r--r--prebuild.xml24
2 files changed, 1 insertions, 25 deletions
diff --git a/OpenSim/Region/CoreModules/World/Terrain/DefaultEffects/ChannelDigger.cs b/OpenSim/Region/CoreModules/World/Terrain/Effects/ChannelDigger.cs
index e23be59..36917e9 100644
--- a/OpenSim/Region/CoreModules/World/Terrain/DefaultEffects/ChannelDigger.cs
+++ b/OpenSim/Region/CoreModules/World/Terrain/Effects/ChannelDigger.cs
@@ -30,7 +30,7 @@ using OpenSim.Region.CoreModules.World.Terrain;
30using OpenSim.Region.CoreModules.World.Terrain.FloodBrushes; 30using OpenSim.Region.CoreModules.World.Terrain.FloodBrushes;
31using OpenSim.Region.Framework.Interfaces; 31using OpenSim.Region.Framework.Interfaces;
32 32
33namespace OpenSim.Region.Modules.Terrain.Extensions.DefaultEffects.Effects 33namespace OpenSim.Region.CoreModules.World.Terrain.Effects
34{ 34{
35 public class ChannelDigger : ITerrainEffect 35 public class ChannelDigger : ITerrainEffect
36 { 36 {
diff --git a/prebuild.xml b/prebuild.xml
index 491e822..5f55461 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -1366,35 +1366,11 @@
1366 <Match pattern="*.addin.xml" path="Resources" buildAction="EmbeddedResource" recurse="true"/> 1366 <Match pattern="*.addin.xml" path="Resources" buildAction="EmbeddedResource" recurse="true"/>
1367 <Match pattern="*.cs" recurse="true"> 1367 <Match pattern="*.cs" recurse="true">
1368 <Exclude name="Tests" pattern="Tests" /> 1368 <Exclude name="Tests" pattern="Tests" />
1369 <Exclude name="TerrainDefaultEffects" pattern="World/Terrain/DefaultEffects" />
1370 </Match> 1369 </Match>
1371 <Match pattern="*.addin.xml" path="Resources" buildAction="EmbeddedResource" recurse="true"/> 1370 <Match pattern="*.addin.xml" path="Resources" buildAction="EmbeddedResource" recurse="true"/>
1372 </Files> 1371 </Files>
1373 </Project> 1372 </Project>
1374 1373
1375 <Project frameworkVersion="v3_5" name="OpenSim.Region.CoreModules.World.Terrain.DefaultEffects" path="OpenSim/Region/CoreModules/World/Terrain/DefaultEffects" type="Library">
1376 <Configuration name="Debug">
1377 <Options>
1378 <OutputPath>../../../../../../bin/Terrain/</OutputPath>
1379 </Options>
1380 </Configuration>
1381 <Configuration name="Release">
1382 <Options>
1383 <OutputPath>../../../../../../bin/Terrain/</OutputPath>
1384 </Options>
1385 </Configuration>
1386
1387 <ReferencePath>../../../../../../bin/</ReferencePath>
1388 <Reference name="System"/>
1389 <Reference name="OpenSim.Framework"/>
1390 <Reference name="OpenSim.Region.Framework"/>
1391 <Reference name="OpenSim.Region.CoreModules"/>
1392 <Files>
1393 <Match pattern="*.cs" recurse="true"/>
1394 </Files>
1395 </Project>
1396
1397
1398 <Project frameworkVersion="v3_5" name="OpenSim.Region.OptionalModules" path="OpenSim/Region/OptionalModules" type="Library"> 1374 <Project frameworkVersion="v3_5" name="OpenSim.Region.OptionalModules" path="OpenSim/Region/OptionalModules" type="Library">
1399 <Configuration name="Debug"> 1375 <Configuration name="Debug">
1400 <Options> 1376 <Options>