diff options
| author | Melanie | 2009-12-05 19:53:54 +0000 |
|---|---|---|
| committer | Melanie | 2009-12-05 19:53:54 +0000 |
| commit | 43a6fa1d01707fda74b8ba7c2d9fb95210463b6a (patch) | |
| tree | 77c5897901544e82467b1cdfafdc63644ee821ef /OpenSim/Region/Framework/Interfaces/ITerrainModule.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | * Fix line endings in BaseHttpServer.cs (diff) | |
| download | opensim-SC-43a6fa1d01707fda74b8ba7c2d9fb95210463b6a.zip opensim-SC-43a6fa1d01707fda74b8ba7c2d9fb95210463b6a.tar.gz opensim-SC-43a6fa1d01707fda74b8ba7c2d9fb95210463b6a.tar.bz2 opensim-SC-43a6fa1d01707fda74b8ba7c2d9fb95210463b6a.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Framework/Interfaces/ITerrainModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/ITerrainModule.cs b/OpenSim/Region/Framework/Interfaces/ITerrainModule.cs index 2dcba0c..7caac55 100644 --- a/OpenSim/Region/Framework/Interfaces/ITerrainModule.cs +++ b/OpenSim/Region/Framework/Interfaces/ITerrainModule.cs | |||
| @@ -51,7 +51,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
| 51 | /// </param> | 51 | /// </param> |
| 52 | /// <param name="stream"></param> | 52 | /// <param name="stream"></param> |
| 53 | void LoadFromStream(string filename, Stream stream); | 53 | void LoadFromStream(string filename, Stream stream); |
| 54 | 54 | void LoadFromStream(string filename, System.Uri pathToTerrainHeightmap); | |
| 55 | /// <summary> | 55 | /// <summary> |
| 56 | /// Save a terrain to a stream. | 56 | /// Save a terrain to a stream. |
| 57 | /// </summary> | 57 | /// </summary> |