diff options
| author | Jonathan Freedman | 2010-10-03 18:04:38 -0400 |
|---|---|---|
| committer | Jonathan Freedman | 2010-10-03 18:04:38 -0400 |
| commit | e3099d48f9ebfaa7b1feede2d6f2788bdc93552b (patch) | |
| tree | 4bddd7ea4e3d4671c9c4956fc7f6105219d88338 /OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | |
| parent | * additional serveruri cleanup (diff) | |
| parent | Upgraded Mono.Addins.dll to 0.5, coming from here: http://monoaddins.codeplex... (diff) | |
| download | opensim-SC_OLD-e3099d48f9ebfaa7b1feede2d6f2788bdc93552b.zip opensim-SC_OLD-e3099d48f9ebfaa7b1feede2d6f2788bdc93552b.tar.gz opensim-SC_OLD-e3099d48f9ebfaa7b1feede2d6f2788bdc93552b.tar.bz2 opensim-SC_OLD-e3099d48f9ebfaa7b1feede2d6f2788bdc93552b.tar.xz | |
Merge branch 'master' of git://opensimulator.org/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs')
| -rw-r--r-- | OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs index 71cf306..fdbbccf 100644 --- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs +++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | |||
| @@ -1011,7 +1011,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap | |||
| 1011 | if (terrain == null) | 1011 | if (terrain == null) |
| 1012 | return; | 1012 | return; |
| 1013 | 1013 | ||
| 1014 | byte[] data = terrain.WriteJpeg2000Image("defaultstripe.png"); | 1014 | byte[] data = terrain.WriteJpeg2000Image(); |
| 1015 | if (data == null) | 1015 | if (data == null) |
| 1016 | return; | 1016 | return; |
| 1017 | 1017 | ||