aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules
diff options
context:
space:
mode:
authorMelanie Thielker2015-11-01 23:40:54 +0100
committerMelanie Thielker2015-11-01 23:40:54 +0100
commit3da0a318b32000c899cc0e7f9a911a29820959e3 (patch)
tree8effce3d75029402294eb18155399693c735c4e7 /OpenSim/Region/CoreModules
parentMore EntityTransferContext plumbing (diff)
parentDon't crash the sim if the map image is null. (diff)
downloadopensim-SC_OLD-3da0a318b32000c899cc0e7f9a911a29820959e3.zip
opensim-SC_OLD-3da0a318b32000c899cc0e7f9a911a29820959e3.tar.gz
opensim-SC_OLD-3da0a318b32000c899cc0e7f9a911a29820959e3.tar.bz2
opensim-SC_OLD-3da0a318b32000c899cc0e7f9a911a29820959e3.tar.xz
Merge branch 'avinationmerge' of opensimulator.org:/var/git/opensim into avinationmerge
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs8
1 files changed, 7 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs
index 5365b49..ef0eec5 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.MapImage
58 { 58 {
59 private static readonly ILog m_log = 59 private static readonly ILog m_log =
60 LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 60 LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
61 private static string LogHeader = "[MAP IMAGE SERVICE MODULE]"; 61 private static string LogHeader = "[MAP IMAGE SERVICE MODULE]:";
62 62
63 private bool m_enabled = false; 63 private bool m_enabled = false;
64 private IMapImageService m_MapService; 64 private IMapImageService m_MapService;
@@ -204,6 +204,12 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.MapImage
204 204
205 public void UploadMapTile(IScene scene, Bitmap mapTile) 205 public void UploadMapTile(IScene scene, Bitmap mapTile)
206 { 206 {
207 if (mapTile == null)
208 {
209 m_log.WarnFormat("{0} Cannot upload null image", LogHeader);
210 return;
211 }
212
207 m_log.DebugFormat("{0} Upload maptile for {1}", LogHeader, scene.Name); 213 m_log.DebugFormat("{0} Upload maptile for {1}", LogHeader, scene.Name);
208 214
209 // mapTile.Save( // DEBUG DEBUG 215 // mapTile.Save( // DEBUG DEBUG