diff options
| author | Melanie | 2011-06-20 03:11:34 +0100 |
|---|---|---|
| committer | Melanie | 2011-06-20 03:11:34 +0100 |
| commit | 6ae73aea496684cf3e72264c805216fcc7de66da (patch) | |
| tree | ff42233fc49c9772aa945e062422645c8186ab7d /OpenSim/Services/MapImageService/MapImageService.cs | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC-6ae73aea496684cf3e72264c805216fcc7de66da.zip opensim-SC-6ae73aea496684cf3e72264c805216fcc7de66da.tar.gz opensim-SC-6ae73aea496684cf3e72264c805216fcc7de66da.tar.bz2 opensim-SC-6ae73aea496684cf3e72264c805216fcc7de66da.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Services/MapImageService/MapImageService.cs')
| -rw-r--r-- | OpenSim/Services/MapImageService/MapImageService.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/MapImageService/MapImageService.cs b/OpenSim/Services/MapImageService/MapImageService.cs index 27722bb..7e7391c 100644 --- a/OpenSim/Services/MapImageService/MapImageService.cs +++ b/OpenSim/Services/MapImageService/MapImageService.cs | |||
| @@ -143,7 +143,7 @@ namespace OpenSim.Services.MapImageService | |||
| 143 | if (File.Exists(fullName)) | 143 | if (File.Exists(fullName)) |
| 144 | { | 144 | { |
| 145 | format = Path.GetExtension(fileName).ToLower(); | 145 | format = Path.GetExtension(fileName).ToLower(); |
| 146 | m_log.DebugFormat("[MAP IMAGE SERVICE]: Found file {0}, extension {1}", fileName, format); | 146 | //m_log.DebugFormat("[MAP IMAGE SERVICE]: Found file {0}, extension {1}", fileName, format); |
| 147 | return File.ReadAllBytes(fullName); | 147 | return File.ReadAllBytes(fullName); |
| 148 | } | 148 | } |
| 149 | else if (File.Exists(m_WaterTileFile)) | 149 | else if (File.Exists(m_WaterTileFile)) |