ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-12 04:05:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster-presence-refactor

Browse Source
This commit is contained in:
Melanie
2010-07-31 00:57:50 +01:00
parent f9280374d2 86bc25b84f
commit 3302e8ddc4
28 changed files with 190 additions and 2322 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/CoreModules/World/Terrain/DefaultEffects/ChannelDigger.cs → OpenSim/Region/CoreModules/World/Terrain/Effects/ChannelDigger.cs
View File

@@ -30,7 +30,7 @@ using OpenSim.Region.CoreModules.World.Terrain;
using OpenSim.Region.CoreModules.World.Terrain.FloodBrushes;
using OpenSim.Region.Framework.Interfaces;
namespace OpenSim.Region.Modules.Terrain.Extensions.DefaultEffects.Effects
namespace OpenSim.Region.CoreModules.World.Terrain.Effects
{
public class ChannelDigger : ITerrainEffect
{

9
OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
View File

@@ -68,7 +68,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
#endregion
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private readonly Commander m_commander = new Commander("terrain");
private readonly Dictionary<StandardTerrainEffects, ITerrainFloodEffect> m_floodeffects =
@@ -381,8 +381,13 @@ namespace OpenSim.Region.CoreModules.World.Terrain
private void LoadPlugins()
{
m_plugineffects = new Dictionary<string, ITerrainEffect>();
string plugineffectsPath = "Terrain";
// Load the files in the Terrain/ dir
string[] files = Directory.GetFiles("Terrain");
if (!Directory.Exists(plugineffectsPath))
return;
string[] files = Directory.GetFiles(plugineffectsPath);
foreach (string file in files)
{
m_log.Info("Loading effects in " + file);