diff options
author | Robert Adams | 2014-01-19 07:33:56 -0800 |
---|---|---|
committer | Robert Adams | 2014-01-19 07:33:56 -0800 |
commit | 54a4b9eab4009711f574fe744e2dd82373c971c9 (patch) | |
tree | a5b587fd456bd1c5c50629f0f85ecf83bef0154d /OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage | |
parent | Add J2K decoder routine that converts directly to an image. (diff) | |
download | opensim-SC_OLD-54a4b9eab4009711f574fe744e2dd82373c971c9.zip opensim-SC_OLD-54a4b9eab4009711f574fe744e2dd82373c971c9.tar.gz opensim-SC_OLD-54a4b9eab4009711f574fe744e2dd82373c971c9.tar.bz2 opensim-SC_OLD-54a4b9eab4009711f574fe744e2dd82373c971c9.tar.xz |
varregion: Update Warp3D to properly handle varregions.
This includes additions to Warp3D:
Optional rendering of mesh and scupltie prims (INI parameter. Off by default)
Texturing of large prims (INI parameter. On by default)
Better garbage collection
Diffstat (limited to 'OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage')
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs index e4a875d..4d7538c 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs | |||
@@ -207,9 +207,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.MapImage | |||
207 | { | 207 | { |
208 | if (mapTile != null) | 208 | if (mapTile != null) |
209 | { | 209 | { |
210 | mapTile.Save( // DEBUG DEBUG | 210 | // mapTile.Save( // DEBUG DEBUG |
211 | String.Format("maptiles/raw-{0}-{1}-{2}.jpg", regionName, scene.RegionInfo.RegionSizeX, scene.RegionInfo.RegionSizeY), | 211 | // String.Format("maptiles/raw-{0}-{1}-{2}.jpg", regionName, scene.RegionInfo.RegionLocX, scene.RegionInfo.RegionLocY), |
212 | ImageFormat.Jpeg); | 212 | // ImageFormat.Jpeg); |
213 | // If the region/maptile is legacy sized, just upload the one tile like it has always been done | 213 | // If the region/maptile is legacy sized, just upload the one tile like it has always been done |
214 | if (mapTile.Width == Constants.RegionSize && mapTile.Height == Constants.RegionSize) | 214 | if (mapTile.Width == Constants.RegionSize && mapTile.Height == Constants.RegionSize) |
215 | { | 215 | { |
@@ -235,8 +235,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.MapImage | |||
235 | (int)Constants.RegionSize, (int)Constants.RegionSize); | 235 | (int)Constants.RegionSize, (int)Constants.RegionSize); |
236 | using (Bitmap subMapTile = mapTile.Clone(rect, mapTile.PixelFormat)) | 236 | using (Bitmap subMapTile = mapTile.Clone(rect, mapTile.PixelFormat)) |
237 | { | 237 | { |
238 | m_log.DebugFormat("{0} ConvertAndUploadMaptile: {1}: rect={2}, xx,yy=<{3},{4}>", | ||
239 | LogHeader, regionName, rect, xx, yy); | ||
240 | ConvertAndUploadMaptile(subMapTile, | 238 | ConvertAndUploadMaptile(subMapTile, |
241 | scene.RegionInfo.RegionLocX + (xx / Constants.RegionSize), | 239 | scene.RegionInfo.RegionLocX + (xx / Constants.RegionSize), |
242 | scene.RegionInfo.RegionLocY + (yy / Constants.RegionSize), | 240 | scene.RegionInfo.RegionLocY + (yy / Constants.RegionSize), |