diff options
author | Justin Clark-Casey (justincc) | 2012-06-06 04:18:38 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-06-06 04:18:38 +0100 |
commit | 514dd85199331d8246c3a0dfc9cf782f61f48ef6 (patch) | |
tree | 50579cb254b36bfe58029e0b468ae7a15363623c /OpenSim/Region/CoreModules | |
parent | Rename MapImageModule for Warp3D to Warp3DImageModule to match its class name... (diff) | |
download | opensim-SC-514dd85199331d8246c3a0dfc9cf782f61f48ef6.zip opensim-SC-514dd85199331d8246c3a0dfc9cf782f61f48ef6.tar.gz opensim-SC-514dd85199331d8246c3a0dfc9cf782f61f48ef6.tar.bz2 opensim-SC-514dd85199331d8246c3a0dfc9cf782f61f48ef6.tar.xz |
minor: Change log messages on Warp3DImageModule to show they are from this module
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs b/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs index 3538b46..9002a9f 100644 --- a/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs +++ b/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs | |||
@@ -54,8 +54,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap | |||
54 | private static readonly UUID TEXTURE_METADATA_MAGIC = new UUID("802dc0e0-f080-4931-8b57-d1be8611c4f3"); | 54 | private static readonly UUID TEXTURE_METADATA_MAGIC = new UUID("802dc0e0-f080-4931-8b57-d1be8611c4f3"); |
55 | private static readonly Color4 WATER_COLOR = new Color4(29, 72, 96, 216); | 55 | private static readonly Color4 WATER_COLOR = new Color4(29, 72, 96, 216); |
56 | 56 | ||
57 | private static readonly ILog m_log = | 57 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
58 | LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
59 | 58 | ||
60 | private Scene m_scene; | 59 | private Scene m_scene; |
61 | private IRendering m_primMesher; | 60 | private IRendering m_primMesher; |
@@ -88,11 +87,11 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap | |||
88 | if (renderers.Count > 0) | 87 | if (renderers.Count > 0) |
89 | { | 88 | { |
90 | m_primMesher = RenderingLoader.LoadRenderer(renderers[0]); | 89 | m_primMesher = RenderingLoader.LoadRenderer(renderers[0]); |
91 | m_log.Debug("[MAPTILE]: Loaded prim mesher " + m_primMesher.ToString()); | 90 | m_log.DebugFormat("[WARP 3D IMAGE MODULE]: Loaded prim mesher {0}", m_primMesher); |
92 | } | 91 | } |
93 | else | 92 | else |
94 | { | 93 | { |
95 | m_log.Debug("[MAPTILE]: No prim mesher loaded, prim rendering will be disabled"); | 94 | m_log.Debug("[WARP 3D IMAGE MODULE]: No prim mesher loaded, prim rendering will be disabled"); |
96 | } | 95 | } |
97 | 96 | ||
98 | m_scene.RegisterModuleInterface<IMapImageGenerator>(this); | 97 | m_scene.RegisterModuleInterface<IMapImageGenerator>(this); |
@@ -150,7 +149,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap | |||
150 | } | 149 | } |
151 | catch | 150 | catch |
152 | { | 151 | { |
153 | m_log.Warn("[MAPTILE]: Failed to load StartupConfig"); | 152 | m_log.Warn("[WARP 3D IMAGE MODULE]: Failed to load StartupConfig"); |
154 | } | 153 | } |
155 | 154 | ||
156 | m_colors.Clear(); | 155 | m_colors.Clear(); |
@@ -222,7 +221,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap | |||
222 | catch (Exception e) | 221 | catch (Exception e) |
223 | { | 222 | { |
224 | // JPEG2000 encoder failed | 223 | // JPEG2000 encoder failed |
225 | m_log.Error("[MAPTILE]: Failed generating terrain map: " + e); | 224 | m_log.Error("[WARP 3D IMAGE MODULE]: Failed generating terrain map: ", e); |
226 | } | 225 | } |
227 | 226 | ||
228 | return null; | 227 | return null; |
@@ -619,7 +618,10 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap | |||
619 | } | 618 | } |
620 | catch (Exception ex) | 619 | catch (Exception ex) |
621 | { | 620 | { |
622 | m_log.WarnFormat("[MAPTILE]: Error decoding JPEG2000 texture {0} ({1} bytes): {2}", textureID, j2kData.Length, ex.Message); | 621 | m_log.WarnFormat( |
622 | "[WARP 3D IMAGE MODULE]: Error decoding JPEG2000 texture {0} ({1} bytes): {2}", | ||
623 | textureID, j2kData.Length, ex.Message); | ||
624 | |||
623 | width = 0; | 625 | width = 0; |
624 | height = 0; | 626 | height = 0; |
625 | return new Color4(0.5f, 0.5f, 0.5f, 1.0f); | 627 | return new Color4(0.5f, 0.5f, 0.5f, 1.0f); |