ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 01:06:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

bad merge?

Browse Source
This commit is contained in:
UbitUmarov
2015-09-01 14:54:35 +01:00
parent f811fdfb70 31a50a73cb
commit 371c9dd2af
406 changed files with 62562 additions and 8067 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/Framework/Interfaces/IWorldMapModule.cs
View File

@@ -37,6 +37,10 @@ namespace OpenSim.Region.Framework.Interfaces
/// </summary>
void GenerateMaptile();
List<MapBlockData> Map2BlockFromGridRegion(GridRegion r, uint flag);
<<<<<<< HEAD
MapBlockData MapBlockFromGridRegion(GridRegion r, uint flag);
=======
void MapBlockFromGridRegion(MapBlockData block, GridRegion r, uint flag);
>>>>>>> avn/ubitvar
}
}