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

Merge branch 'master' into careminster

Browse Source 
Conflicts:
	OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
This commit is contained in:
Melanie
2012-06-06 13:07:05 +01:00
parent 728249ba49 514dd85199
commit e733fb32cf
17 changed files with 523 additions and 441 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
OpenSim/Region/OptionalModules/World/WorldView/WorldViewModule.cs
View File

@@ -113,14 +113,15 @@ namespace OpenSim.Region.OptionalModules.World.WorldView
if (!m_Enabled)
return new Byte[0];
Bitmap bmp = m_Generator.CreateViewImage(pos, rot, fov, width,
height, usetex);
using (Bitmap bmp = m_Generator.CreateViewImage(pos, rot, fov, width, height, usetex))
{
using (MemoryStream str = new MemoryStream())
{
bmp.Save(str, ImageFormat.Jpeg);
MemoryStream str = new MemoryStream();
bmp.Save(str, ImageFormat.Jpeg);
return str.ToArray();
return str.ToArray();
}
}
}
}
}