diff options
| author | UbitUmarov | 2015-09-01 14:54:35 +0100 |
|---|---|---|
| committer | UbitUmarov | 2015-09-01 14:54:35 +0100 |
| commit | 371c9dd2af01a2e7422ec901ee1f80757284a78c (patch) | |
| tree | 058d2a513cacb12efcce0c0df0ae14ad135dbfe2 /OpenSim/Region/Framework/Interfaces/IWorldMapModule.cs | |
| parent | remove lixo (diff) | |
| parent | dont change camera on crossings (diff) | |
| download | opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.zip opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.gz opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.bz2 opensim-SC_OLD-371c9dd2af01a2e7422ec901ee1f80757284a78c.tar.xz | |
bad merge?
Diffstat (limited to 'OpenSim/Region/Framework/Interfaces/IWorldMapModule.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Interfaces/IWorldMapModule.cs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IWorldMapModule.cs b/OpenSim/Region/Framework/Interfaces/IWorldMapModule.cs index 9c781e1..08dc3e3 100644 --- a/OpenSim/Region/Framework/Interfaces/IWorldMapModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IWorldMapModule.cs | |||
| @@ -37,6 +37,10 @@ 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 | ||
| 40 | MapBlockData MapBlockFromGridRegion(GridRegion r, uint flag); | 41 | MapBlockData MapBlockFromGridRegion(GridRegion r, uint flag); |
| 42 | ======= | ||
| 43 | void MapBlockFromGridRegion(MapBlockData block, GridRegion r, uint flag); | ||
| 44 | >>>>>>> avn/ubitvar | ||
| 41 | } | 45 | } |
| 42 | } | 46 | } |