diff options
| author | UbitUmarov | 2015-09-02 19:54:53 +0100 |
|---|---|---|
| committer | UbitUmarov | 2015-09-02 19:54:53 +0100 |
| commit | a11edceb00b5b86f825bd957bdac9edb91f893dd (patch) | |
| tree | c192eae26f3aadf365a66f32fc6d9ade2f0a0c61 /OpenSim/Region/Framework/Interfaces/IWorldMapModule.cs | |
| parent | bad merge? (diff) | |
| download | opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.zip opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.gz opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.bz2 opensim-SC_OLD-a11edceb00b5b86f825bd957bdac9edb91f893dd.tar.xz | |
seems to compile ( tests comented out)
Diffstat (limited to 'OpenSim/Region/Framework/Interfaces/IWorldMapModule.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Interfaces/IWorldMapModule.cs | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IWorldMapModule.cs b/OpenSim/Region/Framework/Interfaces/IWorldMapModule.cs index 08dc3e3..e9cf4ad 100644 --- a/OpenSim/Region/Framework/Interfaces/IWorldMapModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IWorldMapModule.cs | |||
| @@ -37,10 +37,6 @@ namespace OpenSim.Region.Framework.Interfaces | |||
| 37 | /// </summary> | 37 | /// </summary> |
| 38 | void GenerateMaptile(); | 38 | void GenerateMaptile(); |
| 39 | List<MapBlockData> Map2BlockFromGridRegion(GridRegion r, uint flag); | 39 | List<MapBlockData> Map2BlockFromGridRegion(GridRegion r, uint flag); |
| 40 | <<<<<<< HEAD | ||
| 41 | MapBlockData MapBlockFromGridRegion(GridRegion r, uint flag); | ||
| 42 | ======= | ||
| 43 | void MapBlockFromGridRegion(MapBlockData block, GridRegion r, uint flag); | 40 | void MapBlockFromGridRegion(MapBlockData block, GridRegion r, uint flag); |
| 44 | >>>>>>> avn/ubitvar | ||
| 45 | } | 41 | } |
| 46 | } | 42 | } |