aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Interfaces
diff options
context:
space:
mode:
authorunknown2009-12-07 18:14:02 +0100
committerunknown2009-12-07 18:14:02 +0100
commitdbd8c400ce9eb9177bb9d0b939405578ad9c3157 (patch)
tree61daf67c74c14ad10147a115f7ef673c73968840 /OpenSim/Region/Framework/Interfaces
parentInitial windlight codebase commit (diff)
parentSame for the remote auth connector (diff)
downloadopensim-SC-dbd8c400ce9eb9177bb9d0b939405578ad9c3157.zip
opensim-SC-dbd8c400ce9eb9177bb9d0b939405578ad9c3157.tar.gz
opensim-SC-dbd8c400ce9eb9177bb9d0b939405578ad9c3157.tar.bz2
opensim-SC-dbd8c400ce9eb9177bb9d0b939405578ad9c3157.tar.xz
Merge branch 'careminster' into windlight
Diffstat (limited to 'OpenSim/Region/Framework/Interfaces')
-rw-r--r--OpenSim/Region/Framework/Interfaces/ITerrainModule.cs2
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>