diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/Scripting')
4 files changed, 18 insertions, 8 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; |
diff --git a/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs b/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs index 96618e0..4abc55d 100644 --- a/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs | |||
@@ -34,11 +34,15 @@ using OpenMetaverse; | |||
34 | using OpenMetaverse.Imaging; | 34 | using OpenMetaverse.Imaging; |
35 | using OpenSim.Region.Framework.Interfaces; | 35 | using OpenSim.Region.Framework.Interfaces; |
36 | using OpenSim.Region.Framework.Scenes; | 36 | using OpenSim.Region.Framework.Scenes; |
37 | using log4net; | ||
38 | using System.Reflection; | ||
37 | 39 | ||
38 | namespace OpenSim.Region.CoreModules.Scripting.LoadImageURL | 40 | namespace OpenSim.Region.CoreModules.Scripting.LoadImageURL |
39 | { | 41 | { |
40 | public class LoadImageURLModule : IRegionModule, IDynamicTextureRender | 42 | public class LoadImageURLModule : IRegionModule, IDynamicTextureRender |
41 | { | 43 | { |
44 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
45 | |||
42 | private string m_name = "LoadImageURL"; | 46 | private string m_name = "LoadImageURL"; |
43 | private Scene m_scene; | 47 | private Scene m_scene; |
44 | private IDynamicTextureManager m_textureManager; | 48 | private IDynamicTextureManager m_textureManager; |
@@ -203,8 +207,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LoadImageURL | |||
203 | } | 207 | } |
204 | catch (Exception) | 208 | catch (Exception) |
205 | { | 209 | { |
206 | Console.WriteLine( | 210 | m_log.Error("[LOADIMAGEURLMODULE]: OpenJpeg Encode Failed. Empty byte data returned!"); |
207 | "[LOADIMAGEURLMODULE]: OpenJpeg Encode Failed. Empty byte data returned!"); | ||
208 | } | 211 | } |
209 | 212 | ||
210 | m_textureManager.ReturnData(state.RequestID, imageJ2000); | 213 | m_textureManager.ReturnData(state.RequestID, imageJ2000); |
diff --git a/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs b/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs index e7fabbe..4fb500e 100644 --- a/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs | |||
@@ -36,6 +36,8 @@ using OpenMetaverse; | |||
36 | using OpenMetaverse.Imaging; | 36 | using OpenMetaverse.Imaging; |
37 | using OpenSim.Region.Framework.Interfaces; | 37 | using OpenSim.Region.Framework.Interfaces; |
38 | using OpenSim.Region.Framework.Scenes; | 38 | using OpenSim.Region.Framework.Scenes; |
39 | using log4net; | ||
40 | using System.Reflection; | ||
39 | 41 | ||
40 | //using Cairo; | 42 | //using Cairo; |
41 | 43 | ||
@@ -43,6 +45,8 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender | |||
43 | { | 45 | { |
44 | public class VectorRenderModule : IRegionModule, IDynamicTextureRender | 46 | public class VectorRenderModule : IRegionModule, IDynamicTextureRender |
45 | { | 47 | { |
48 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
49 | |||
46 | private string m_name = "VectorRenderModule"; | 50 | private string m_name = "VectorRenderModule"; |
47 | private Scene m_scene; | 51 | private Scene m_scene; |
48 | private IDynamicTextureManager m_textureManager; | 52 | private IDynamicTextureManager m_textureManager; |
@@ -317,7 +321,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender | |||
317 | } | 321 | } |
318 | catch (Exception) | 322 | catch (Exception) |
319 | { | 323 | { |
320 | Console.WriteLine( | 324 | m_log.Error( |
321 | "[VECTORRENDERMODULE]: OpenJpeg Encode Failed. Empty byte data returned!"); | 325 | "[VECTORRENDERMODULE]: OpenJpeg Encode Failed. Empty byte data returned!"); |
322 | } | 326 | } |
323 | m_textureManager.ReturnData(id, imageJ2000); | 327 | m_textureManager.ReturnData(id, imageJ2000); |
@@ -333,7 +337,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender | |||
333 | catch (Exception) | 337 | catch (Exception) |
334 | { | 338 | { |
335 | //Ckrinke: Add a WriteLine to remove the warning about 'e' defined but not used | 339 | //Ckrinke: Add a WriteLine to remove the warning about 'e' defined but not used |
336 | // Console.WriteLine("Problem with Draw. Please verify parameters." + e.ToString()); | 340 | // m_log.Debug("Problem with Draw. Please verify parameters." + e.ToString()); |
337 | parsed = -1; | 341 | parsed = -1; |
338 | } | 342 | } |
339 | 343 | ||
diff --git a/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs b/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs index 38cb502..d917adc 100644 --- a/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs | |||
@@ -333,7 +333,7 @@ namespace OpenSim.Region.CoreModules.Scripting.XMLRPC | |||
333 | } | 333 | } |
334 | else | 334 | else |
335 | { | 335 | { |
336 | Console.WriteLine("UNABLE TO REMOVE COMPLETED REQUEST"); | 336 | m_log.Error("UNABLE TO REMOVE COMPLETED REQUEST"); |
337 | } | 337 | } |
338 | } | 338 | } |
339 | } | 339 | } |