ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 00:46:02 +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

18
OpenSim/Region/Framework/Interfaces/IMapImageUploadModule.cs
View File

@@ -25,13 +25,29 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
<<<<<<< HEAD
using System.Drawing;
using OpenSim.Framework;
=======
using OpenMetaverse;
using OpenSim.Framework;
using System.Drawing;
>>>>>>> avn/ubitvar
namespace OpenSim.Region.Framework.Interfaces
{
public interface IMapImageUploadModule
{
<<<<<<< HEAD
void UploadMapTile(IScene scene, Bitmap mapTile);
}
}
}
=======
/// <summary>
/// Upload a new maptile
/// </summary>
void UploadMapTile(IScene scene);
void UploadMapTile(IScene scene, Bitmap mapTile);
}
}
>>>>>>> avn/ubitvar