ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-11 03:45:35 +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

6
OpenSim/Services/Interfaces/IMapImageService.cs
View File

@@ -34,8 +34,14 @@ namespace OpenSim.Services.Interfaces
public interface IMapImageService
{
//List<MapBlockData> GetMapBlocks(UUID scopeID, int minX, int minY, int maxX, int maxY);
<<<<<<< HEAD
bool AddMapTile(int x, int y, byte[] imageData, out string reason);
bool RemoveMapTile(int x, int y, out string reason);
byte[] GetMapTile(string fileName, out string format);
=======
bool AddMapTile(int x, int y, byte[] imageData, UUID scopeID, out string reason);
bool RemoveMapTile(int x, int y, UUID scopeID, out string reason);
byte[] GetMapTile(string fileName, UUID scopeID, out string format);
>>>>>>> avn/ubitvar
}
}