diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-03-01 13:31:17 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-03-01 13:31:17 -0800 |
| commit | 24789f11cc58cf7c03283a8e9648085a5cb9d7d8 (patch) | |
| tree | bade7e21ca009bdb6a9f89b155732876bb02035d /indra/newview/tests | |
| parent | a7499dc4abfa5fa7582dc7ebb535a07ed94d0c4f (diff) | |
| parent | 66f101bac591d82b71ab7dc976b6fed0ed451909 (diff) | |
Pull from viewer-experience
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() |