Merge branch 'master' of git://opensimulator.org/git/opensim

This commit is contained in:
Jonathan Freedman
2010-10-03 18:04:38 -04:00
20 changed files with 1506 additions and 71 deletions

View File

@@ -411,7 +411,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
return;
}
using (Image mapTile = tileGenerator.CreateMapTile("defaultstripe.png"))
using (Image mapTile = tileGenerator.CreateMapTile())
{
using (MemoryStream stream = new MemoryStream())
{