diff options
| author | Richard Linden <none@none> | 2012-03-22 10:58:04 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-03-22 10:58:04 -0700 |
| commit | d6d1cb852d014dd002656ed35537975ebb6300b0 (patch) | |
| tree | 0e432c855eb3105e2c1e2bd67a3010b6c73f7b50 /indra/newview/tests | |
| parent | b187aeb8f177bd76e792652e773617beff18b47b (diff) | |
| parent | 71db6d1b91cb8a62959a63ae36d3727e48439245 (diff) | |
Automated merge with http://hg.secondlife.com/viewer-release
Diffstat (limited to 'indra/newview/tests')
| -rw-r--r-- | indra/newview/tests/llworldmipmap_test.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/tests/llworldmipmap_test.cpp b/indra/newview/tests/llworldmipmap_test.cpp index 4c0959d1a9..e7ef017760 100644 --- a/indra/newview/tests/llworldmipmap_test.cpp +++ b/indra/newview/tests/llworldmipmap_test.cpp @@ -100,9 +100,9 @@ namespace tut { S32 level = mMap->scaleToLevel(0.0); ensure("scaleToLevel() test 1 failed", level == LLWorldMipmap::MAP_LEVELS); - level = mMap->scaleToLevel(LLWorldMipmap::MAP_TILE_SIZE); + level = mMap->scaleToLevel((F32)LLWorldMipmap::MAP_TILE_SIZE); ensure("scaleToLevel() test 2 failed", level == 1); - level = mMap->scaleToLevel(10 * LLWorldMipmap::MAP_TILE_SIZE); + level = mMap->scaleToLevel(10.f * LLWorldMipmap::MAP_TILE_SIZE); ensure("scaleToLevel() test 3 failed", level == 1); } // Test 2 : globalToMipmap() |