Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2010-10-03 16:52:27 +01:00
15 changed files with 1465 additions and 71 deletions

View File

@@ -73,7 +73,7 @@ namespace OpenSim.Region.Framework.Interfaces
public interface IMapImageGenerator
{
System.Drawing.Bitmap CreateMapTile(string gradientmap);
byte[] WriteJpeg2000Image(string gradientmap);
System.Drawing.Bitmap CreateMapTile();
byte[] WriteJpeg2000Image();
}
}