summaryrefslogtreecommitdiff
path: root/indra/newview/tests/llworldmipmap_test.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2012-02-01 13:03:46 -0800
committerRichard Linden <none@none>2012-02-01 13:03:46 -0800
commit5a14a67e060e7f325025e924c83489cfa236e3dc (patch)
tree2ba0a3d0c746a5f0322f9749e57920784e949ce6 /indra/newview/tests/llworldmipmap_test.cpp
parentb3960899066156bc7d3fd5befb2f7e687a328152 (diff)
converted a bunch of narrowing implicit conversions to explicit
Diffstat (limited to 'indra/newview/tests/llworldmipmap_test.cpp')
-rw-r--r--indra/newview/tests/llworldmipmap_test.cpp4
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()