diff options
| author | Mic Bowman | 2012-04-25 09:52:44 -0700 |
|---|---|---|
| committer | Mic Bowman | 2012-04-25 09:52:44 -0700 |
| commit | 1afae013111b7c817037371fca805a78c3ab67cc (patch) | |
| tree | dc4f08217c64fd92f4fac250344f009f583fca4e /OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs | |
| parent | Add try/catch around Json script method registration to avoild some issues (diff) | |
| parent | Slight rewording of output messages. (diff) | |
| download | opensim-SC_OLD-1afae013111b7c817037371fca805a78c3ab67cc.zip opensim-SC_OLD-1afae013111b7c817037371fca805a78c3ab67cc.tar.gz opensim-SC_OLD-1afae013111b7c817037371fca805a78c3ab67cc.tar.bz2 opensim-SC_OLD-1afae013111b7c817037371fca805a78c3ab67cc.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs b/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs index f86c790..aa306c7 100644 --- a/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs +++ b/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs | |||
| @@ -225,7 +225,7 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap | |||
| 225 | int tc = 0; | 225 | int tc = 0; |
| 226 | double[,] hm = whichScene.Heightmap.GetDoubles(); | 226 | double[,] hm = whichScene.Heightmap.GetDoubles(); |
| 227 | tc = Environment.TickCount; | 227 | tc = Environment.TickCount; |
| 228 | m_log.Info("[MAPTILE]: Generating Maptile Step 2: Object Volume Profile"); | 228 | m_log.Debug("[MAPTILE]: Generating Maptile Step 2: Object Volume Profile"); |
| 229 | EntityBase[] objs = whichScene.GetEntities(); | 229 | EntityBase[] objs = whichScene.GetEntities(); |
| 230 | Dictionary<uint, DrawStruct> z_sort = new Dictionary<uint, DrawStruct>(); | 230 | Dictionary<uint, DrawStruct> z_sort = new Dictionary<uint, DrawStruct>(); |
| 231 | //SortedList<float, RectangleDrawStruct> z_sort = new SortedList<float, RectangleDrawStruct>(); | 231 | //SortedList<float, RectangleDrawStruct> z_sort = new SortedList<float, RectangleDrawStruct>(); |
| @@ -541,7 +541,7 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap | |||
| 541 | g.Dispose(); | 541 | g.Dispose(); |
| 542 | } // lock entities objs | 542 | } // lock entities objs |
| 543 | 543 | ||
| 544 | m_log.Info("[MAPTILE]: Generating Maptile Step 2: Done in " + (Environment.TickCount - tc) + " ms"); | 544 | m_log.Debug("[MAPTILE]: Generating Maptile Step 2: Done in " + (Environment.TickCount - tc) + " ms"); |
| 545 | return mapbmp; | 545 | return mapbmp; |
| 546 | } | 546 | } |
| 547 | 547 | ||