OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

varregion: modify MapImageModule structure so it will better merge 

with changes made in master.
varregion
Robert Adams 2014-01-26 07:38:28 -08:00
parent afb2e07111
commit 6831e58616
1 changed files with 291 additions and 283 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs
View File

@ -283,6 +283,8 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
List<float> z_sortheights = new List<float>(); List<float> z_sortheights = new List<float>();
List<uint> z_localIDs = new List<uint>(); List<uint> z_localIDs = new List<uint>();
try
{
lock (objs) lock (objs)
{ {
foreach (EntityBase obj in objs) foreach (EntityBase obj in objs)
@ -593,9 +595,15 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
//g.FillRectangle(rectDrawStruct.brush , rectDrawStruct.rect); //g.FillRectangle(rectDrawStruct.brush , rectDrawStruct.rect);
} }
} }
} // lock(objs)
}
finally
{
foreach (DrawStruct ds in z_sort.Values)
ds.brush.Dispose();
}
g.Dispose(); g.Dispose();
} // lock entities objs
m_log.Debug("[MAPTILE]: Generating Maptile Step 2: Done in " + (Environment.TickCount - tc) + " ms"); m_log.Debug("[MAPTILE]: Generating Maptile Step 2: Done in " + (Environment.TickCount - tc) + " ms");
return mapbmp; return mapbmp;