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

seems to compile ( tests comented out)

Browse Source
This commit is contained in:
UbitUmarov
2015-09-02 19:54:53 +01:00
parent 371c9dd2af
commit a11edceb00
157 changed files with 1315 additions and 9792 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,10 +37,6 @@ 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
}
}