diff options
| author | Melanie | 2010-03-03 02:07:03 +0000 |
|---|---|---|
| committer | Melanie | 2010-03-03 02:07:03 +0000 |
| commit | 028a87fe37002e7a0611f66babf1deee46c83804 (patch) | |
| tree | 387aec499fd60c2012bed8148e6a2ddc847c3d95 /OpenSim/Region/Framework/Interfaces/ITerrainModule.cs | |
| parent | Revert "test" (diff) | |
| parent | Fixes Region.Framework tests. Although these tests don't fail, they need to b... (diff) | |
| download | opensim-SC_OLD-028a87fe37002e7a0611f66babf1deee46c83804.zip opensim-SC_OLD-028a87fe37002e7a0611f66babf1deee46c83804.tar.gz opensim-SC_OLD-028a87fe37002e7a0611f66babf1deee46c83804.tar.bz2 opensim-SC_OLD-028a87fe37002e7a0611f66babf1deee46c83804.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
This brings careminster on the level of master. To be tested
Diffstat (limited to 'OpenSim/Region/Framework/Interfaces/ITerrainModule.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Interfaces/ITerrainModule.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/ITerrainModule.cs b/OpenSim/Region/Framework/Interfaces/ITerrainModule.cs index 7caac55..5947afb 100644 --- a/OpenSim/Region/Framework/Interfaces/ITerrainModule.cs +++ b/OpenSim/Region/Framework/Interfaces/ITerrainModule.cs | |||
| @@ -62,5 +62,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
| 62 | void SaveToStream(string filename, Stream stream); | 62 | void SaveToStream(string filename, Stream stream); |
| 63 | 63 | ||
| 64 | void InstallPlugin(string name, ITerrainEffect plug); | 64 | void InstallPlugin(string name, ITerrainEffect plug); |
| 65 | |||
| 66 | void UndoTerrain(ITerrainChannel channel); | ||
| 65 | } | 67 | } |
| 66 | } | 68 | } |