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/World/WorldMap | |
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/World/WorldMap')
-rw-r--r-- | OpenSim/Region/CoreModules/World/WorldMap/MapImageModule.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/WorldMap/TexturedMapTileRenderer.cs | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/MapImageModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/MapImageModule.cs index b091c60..5b28430 100644 --- a/OpenSim/Region/CoreModules/World/WorldMap/MapImageModule.cs +++ b/OpenSim/Region/CoreModules/World/WorldMap/MapImageModule.cs | |||
@@ -117,7 +117,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
117 | } | 117 | } |
118 | catch (Exception e) // LEGIT: Catching problems caused by OpenJPEG p/invoke | 118 | catch (Exception e) // LEGIT: Catching problems caused by OpenJPEG p/invoke |
119 | { | 119 | { |
120 | Console.WriteLine("Failed generating terrain map: " + e); | 120 | m_log.Error("Failed generating terrain map: " + e); |
121 | } | 121 | } |
122 | 122 | ||
123 | return imageData; | 123 | return imageData; |
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/TexturedMapTileRenderer.cs b/OpenSim/Region/CoreModules/World/WorldMap/TexturedMapTileRenderer.cs index 8f61af7..1ab8e26 100644 --- a/OpenSim/Region/CoreModules/World/WorldMap/TexturedMapTileRenderer.cs +++ b/OpenSim/Region/CoreModules/World/WorldMap/TexturedMapTileRenderer.cs | |||
@@ -40,6 +40,8 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
40 | { | 40 | { |
41 | // Hue, Saturation, Value; used for color-interpolation | 41 | // Hue, Saturation, Value; used for color-interpolation |
42 | struct HSV { | 42 | struct HSV { |
43 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
44 | |||
43 | public float h; | 45 | public float h; |
44 | public float s; | 46 | public float s; |
45 | public float v; | 47 | public float v; |
@@ -76,10 +78,10 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
76 | // (for info about algorithm, see http://en.wikipedia.org/wiki/HSL_and_HSV) | 78 | // (for info about algorithm, see http://en.wikipedia.org/wiki/HSL_and_HSV) |
77 | public Color toColor() | 79 | public Color toColor() |
78 | { | 80 | { |
79 | if (s < 0f) Console.WriteLine("S < 0: " + s); | 81 | if (s < 0f) m_log.Debug("S < 0: " + s); |
80 | else if (s > 1f) Console.WriteLine("S > 1: " + s); | 82 | else if (s > 1f) m_log.Debug("S > 1: " + s); |
81 | if (v < 0f) Console.WriteLine("V < 0: " + v); | 83 | if (v < 0f) m_log.Debug("V < 0: " + v); |
82 | else if (v > 1f) Console.WriteLine("V > 1: " + v); | 84 | else if (v > 1f) m_log.Debug("V > 1: " + v); |
83 | 85 | ||
84 | float f = h / 60f; | 86 | float f = h / 60f; |
85 | int sector = (int)f % 6; | 87 | int sector = (int)f % 6; |