aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llworldmapview.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2010-02-09 21:11:42 -0600
committerJacek Antonelli2010-02-16 18:50:15 -0600
commite6247fbe78c4d3dacb74f3b2359aba2b6538133b (patch)
tree10c42d670a2c635b4339f7f68809c221756774f8 /linden/indra/newview/llworldmapview.cpp
parentPorted some cURL and HTTP-related changes from Snowglobe. (diff)
downloadmeta-impy-e6247fbe78c4d3dacb74f3b2359aba2b6538133b.zip
meta-impy-e6247fbe78c4d3dacb74f3b2359aba2b6538133b.tar.gz
meta-impy-e6247fbe78c4d3dacb74f3b2359aba2b6538133b.tar.bz2
meta-impy-e6247fbe78c4d3dacb74f3b2359aba2b6538133b.tar.xz
Ported many texture engine changes from Snowglobe.
Diffstat (limited to 'linden/indra/newview/llworldmapview.cpp')
-rw-r--r--linden/indra/newview/llworldmapview.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/linden/indra/newview/llworldmapview.cpp b/linden/indra/newview/llworldmapview.cpp
index 64e84c5..c10faa5 100644
--- a/linden/indra/newview/llworldmapview.cpp
+++ b/linden/indra/newview/llworldmapview.cpp
@@ -378,7 +378,7 @@ void LLWorldMapView::draw()
378 continue; 378 continue;
379 } 379 }
380 380
381 current_image->setBoostLevel(LLViewerImage::BOOST_MAP_LAYER); 381 current_image->setBoostLevel(LLViewerImageBoostLevel::BOOST_MAP_VISIBLE);
382 current_image->setKnownDrawSize(llround(pix_width * LLUI::sGLScaleFactor.mV[VX]), llround(pix_height * LLUI::sGLScaleFactor.mV[VY])); 382 current_image->setKnownDrawSize(llround(pix_width * LLUI::sGLScaleFactor.mV[VX]), llround(pix_height * LLUI::sGLScaleFactor.mV[VY]));
383 383
384 if (!current_image->getHasGLTexture()) 384 if (!current_image->getHasGLTexture())
@@ -557,13 +557,13 @@ void LLWorldMapView::draw()
557 S32 draw_size = llround(gMapScale); 557 S32 draw_size = llround(gMapScale);
558 if (simimage != NULL) 558 if (simimage != NULL)
559 { 559 {
560 simimage->setBoostLevel(LLViewerImage::BOOST_MAP); 560 simimage->setBoostLevel(LLViewerImageBoostLevel::BOOST_MAP);
561 simimage->setKnownDrawSize(llround(draw_size * LLUI::sGLScaleFactor.mV[VX]), llround(draw_size * LLUI::sGLScaleFactor.mV[VY])); 561 simimage->setKnownDrawSize(llround(draw_size * LLUI::sGLScaleFactor.mV[VX]), llround(draw_size * LLUI::sGLScaleFactor.mV[VY]));
562 } 562 }
563 563
564 if (overlayimage != NULL) 564 if (overlayimage != NULL)
565 { 565 {
566 overlayimage->setBoostLevel(LLViewerImage::BOOST_MAP); 566 overlayimage->setBoostLevel(LLViewerImageBoostLevel::BOOST_MAP);
567 overlayimage->setKnownDrawSize(llround(draw_size * LLUI::sGLScaleFactor.mV[VX]), llround(draw_size * LLUI::sGLScaleFactor.mV[VY])); 567 overlayimage->setKnownDrawSize(llround(draw_size * LLUI::sGLScaleFactor.mV[VX]), llround(draw_size * LLUI::sGLScaleFactor.mV[VY]));
568 } 568 }
569 569