diff options
| author | unknown | 2009-12-07 18:14:02 +0100 |
|---|---|---|
| committer | unknown | 2009-12-07 18:14:02 +0100 |
| commit | dbd8c400ce9eb9177bb9d0b939405578ad9c3157 (patch) | |
| tree | 61daf67c74c14ad10147a115f7ef673c73968840 /OpenSim/Region/Framework/Interfaces | |
| parent | Initial windlight codebase commit (diff) | |
| parent | Same for the remote auth connector (diff) | |
| download | opensim-SC_OLD-dbd8c400ce9eb9177bb9d0b939405578ad9c3157.zip opensim-SC_OLD-dbd8c400ce9eb9177bb9d0b939405578ad9c3157.tar.gz opensim-SC_OLD-dbd8c400ce9eb9177bb9d0b939405578ad9c3157.tar.bz2 opensim-SC_OLD-dbd8c400ce9eb9177bb9d0b939405578ad9c3157.tar.xz | |
Merge branch 'careminster' into windlight
Diffstat (limited to 'OpenSim/Region/Framework/Interfaces')
| -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> |