diff options
| author | Melanie | 2012-07-12 08:55:16 +0100 |
|---|---|---|
| committer | Melanie | 2012-07-12 08:55:16 +0100 |
| commit | d632fd7124e3962534fc34f9c7749615dbb62108 (patch) | |
| tree | 84ece06822680bfd5b639d9c3fd046ecbb7a154e /OpenSim/Region/CoreModules/World/Terrain | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | Many explanitory comments added to the link and delink code in (diff) | |
| download | opensim-SC_OLD-d632fd7124e3962534fc34f9c7749615dbb62108.zip opensim-SC_OLD-d632fd7124e3962534fc34f9c7749615dbb62108.tar.gz opensim-SC_OLD-d632fd7124e3962534fc34f9c7749615dbb62108.tar.bz2 opensim-SC_OLD-d632fd7124e3962534fc34f9c7749615dbb62108.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Terrain')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/Terrain/FileLoaders/Terragen.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/Terragen.cs b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/Terragen.cs index 7a0db26..b5c7d33 100644 --- a/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/Terragen.cs +++ b/OpenSim/Region/CoreModules/World/Terrain/FileLoaders/Terragen.cs | |||
| @@ -252,7 +252,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain.FileLoaders | |||
| 252 | if (horizontalScale < 0.01d) | 252 | if (horizontalScale < 0.01d) |
| 253 | horizontalScale = 0.01d; | 253 | horizontalScale = 0.01d; |
| 254 | 254 | ||
| 255 | System.Text.ASCIIEncoding enc = new System.Text.ASCIIEncoding(); | 255 | Encoding enc = Encoding.ASCII; |
| 256 | 256 | ||
| 257 | bs.Write(enc.GetBytes("TERRAGENTERRAIN ")); | 257 | bs.Write(enc.GetBytes("TERRAGENTERRAIN ")); |
| 258 | 258 | ||