aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview
diff options
context:
space:
mode:
authorMcCabe Maxsted2009-09-22 09:20:24 -0700
committerMcCabe Maxsted2009-09-22 09:29:15 -0700
commit697643d5961e6ec6d952f538c02875e2c4249ca4 (patch)
treee6f07e4a276e72952500a05ad4d102dc3c68ce4f /linden/indra/newview
parentApplied Jacek's patch to show number of avatars in world map (diff)
downloadmeta-impy-697643d5961e6ec6d952f538c02875e2c4249ca4.zip
meta-impy-697643d5961e6ec6d952f538c02875e2c4249ca4.tar.gz
meta-impy-697643d5961e6ec6d952f538c02875e2c4249ca4.tar.bz2
meta-impy-697643d5961e6ec6d952f538c02875e2c4249ca4.tar.xz
Fixed map textures displaying as X
Diffstat (limited to 'linden/indra/newview')
-rw-r--r--linden/indra/newview/llworldmapview.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/linden/indra/newview/llworldmapview.cpp b/linden/indra/newview/llworldmapview.cpp
index 2b22b9d..90977ed 100644
--- a/linden/indra/newview/llworldmapview.cpp
+++ b/linden/indra/newview/llworldmapview.cpp
@@ -606,7 +606,11 @@ void LLWorldMapView::draw()
606 gGL.end(); 606 gGL.end();
607 } 607 }
608 608
609 // If this is mature, and you are not, draw a line across it 609 // As part of the AO project, we no longer want to draw access indicators;
610 // it's too complicated to get all the rules straight and will only
611 // cause confusion.
612 /**********************
613 // If this is mature, and you are not, draw a line across it
610 if (info->mAccess != SIM_ACCESS_DOWN 614 if (info->mAccess != SIM_ACCESS_DOWN
611 && info->mAccess > SIM_ACCESS_PG 615 && info->mAccess > SIM_ACCESS_PG
612 && gAgent.isTeen()) 616 && gAgent.isTeen())
@@ -622,6 +626,7 @@ void LLWorldMapView::draw()
622 gGL.vertex2f(right, top); 626 gGL.vertex2f(right, top);
623 gGL.end(); 627 gGL.end();
624 } 628 }
629 **********************/
625 630
626 // Draw the region name in the lower left corner 631 // Draw the region name in the lower left corner
627 LLFontGL* font = LLFontGL::sSansSerifSmall; 632 LLFontGL* font = LLFontGL::sSansSerifSmall;