aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorSean Dague2008-02-26 18:37:42 +0000
committerSean Dague2008-02-26 18:37:42 +0000
commit3bbe09883e32f272d4a2a9e61add1a63b0c740b9 (patch)
treead6ddca77de15de5eb15d516dd7b617f13fa8039 /OpenSim
parent* Implemented - Terragen File Format Loader for new Terrain Module. (diff)
downloadopensim-SC-3bbe09883e32f272d4a2a9e61add1a63b0c740b9.zip
opensim-SC-3bbe09883e32f272d4a2a9e61add1a63b0c740b9.tar.gz
opensim-SC-3bbe09883e32f272d4a2a9e61add1a63b0c740b9.tar.bz2
opensim-SC-3bbe09883e32f272d4a2a9e61add1a63b0c740b9.tar.xz
make trunk compile again. I think Adam forgot to check in some files
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Environment/Modules/Terrain/TerrainModule.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Modules/Terrain/TerrainModule.cs b/OpenSim/Region/Environment/Modules/Terrain/TerrainModule.cs
index f704835..d9fc2f4 100644
--- a/OpenSim/Region/Environment/Modules/Terrain/TerrainModule.cs
+++ b/OpenSim/Region/Environment/Modules/Terrain/TerrainModule.cs
@@ -143,8 +143,8 @@ namespace OpenSim.Region.Environment.Modules.Terrain
143 m_floodeffects[StandardTerrainEffects.Raise] = new FloodBrushes.RaiseArea(); 143 m_floodeffects[StandardTerrainEffects.Raise] = new FloodBrushes.RaiseArea();
144 144
145 // Float[256,256] array format (RAW32) 145 // Float[256,256] array format (RAW32)
146 m_loaders[".r32"] = new FileLoaders.RAW32(); 146 // m_loaders[".r32"] = new FileLoaders.RAW32();
147 m_loaders[".f32"] = m_loaders[".r32"]; 147 // m_loaders[".f32"] = m_loaders[".r32"];
148 } 148 }
149 149
150 public void LoadFromFile(string filename) 150 public void LoadFromFile(string filename)