diff options
author | Charles Krinke | 2009-02-22 20:52:55 +0000 |
---|---|---|
committer | Charles Krinke | 2009-02-22 20:52:55 +0000 |
commit | 8f55b9d735fbc975ce7a4b54e972c17ffbfb1f49 (patch) | |
tree | 96a24a49de82056060dd9b7bab0cb209d5f1a129 /OpenSim/Region/CoreModules/Scripting/DynamicTexture | |
parent | Allow delivery of object messages gridwide (diff) | |
download | opensim-SC_OLD-8f55b9d735fbc975ce7a4b54e972c17ffbfb1f49.zip opensim-SC_OLD-8f55b9d735fbc975ce7a4b54e972c17ffbfb1f49.tar.gz opensim-SC_OLD-8f55b9d735fbc975ce7a4b54e972c17ffbfb1f49.tar.bz2 opensim-SC_OLD-8f55b9d735fbc975ce7a4b54e972c17ffbfb1f49.tar.xz |
Mantis#3218. Thank you kindly, TLaukkan (Tommil) for a patch that:
* Added log4net dependency to physxplugin in prebuild.xml.
* Added missing m_log fields to classes.
* Replaced Console.WriteLine with appropriate m_log.Xxxx
* Tested that nant test target runs succesfully.
* Tested that local opensim sandbox starts up without errors.
Diffstat (limited to 'OpenSim/Region/CoreModules/Scripting/DynamicTexture')
-rw-r--r-- | OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs index ab404bd..b4ec7ae 100644 --- a/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs | |||
@@ -35,6 +35,8 @@ using OpenMetaverse.Imaging; | |||
35 | using OpenSim.Framework; | 35 | using OpenSim.Framework; |
36 | using OpenSim.Region.Framework.Interfaces; | 36 | using OpenSim.Region.Framework.Interfaces; |
37 | using OpenSim.Region.Framework.Scenes; | 37 | using OpenSim.Region.Framework.Scenes; |
38 | using log4net; | ||
39 | using System.Reflection; | ||
38 | 40 | ||
39 | namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture | 41 | namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture |
40 | { | 42 | { |
@@ -86,7 +88,7 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture | |||
86 | { | 88 | { |
87 | if (RenderPlugins.ContainsKey(contentType)) | 89 | if (RenderPlugins.ContainsKey(contentType)) |
88 | { | 90 | { |
89 | //Console.WriteLine("dynamic texture being created: " + url + " of type " + contentType); | 91 | //m_log.Debug("dynamic texture being created: " + url + " of type " + contentType); |
90 | 92 | ||
91 | DynamicTextureUpdater updater = new DynamicTextureUpdater(); | 93 | DynamicTextureUpdater updater = new DynamicTextureUpdater(); |
92 | updater.SimUUID = simID; | 94 | updater.SimUUID = simID; |
@@ -192,6 +194,8 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture | |||
192 | 194 | ||
193 | public class DynamicTextureUpdater | 195 | public class DynamicTextureUpdater |
194 | { | 196 | { |
197 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
198 | |||
195 | public bool BlendWithOldTexture = false; | 199 | public bool BlendWithOldTexture = false; |
196 | public string BodyData; | 200 | public string BodyData; |
197 | public string ContentType; | 201 | public string ContentType; |
@@ -302,8 +306,7 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture | |||
302 | } | 306 | } |
303 | catch (Exception) | 307 | catch (Exception) |
304 | { | 308 | { |
305 | Console.WriteLine( | 309 | m_log.Error("[DYNAMICTEXTUREMODULE]: OpenJpeg Encode Failed. Empty byte data returned!"); |
306 | "[DYNAMICTEXTUREMODULE]: OpenJpeg Encode Failed. Empty byte data returned!"); | ||
307 | } | 310 | } |
308 | 311 | ||
309 | return result; | 312 | return result; |