2 files changed, 12 insertions, 2 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index ad83d48..1f3d3ae 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -12,7 +12,12 @@
         
                 modified:   linden/indra/newview/app_settings/settings.xml
                 modified:   linden/indra/newview/llworldmapview.cpp
-
+                
+                
+        * Fixed map textures displaying an X.
+        
+                modified:   linden/indra/newview/llworldmapview.cpp
+                
                 
 2009-09-20 McCabe Maxsted  <hakushakukun@gmail.com>
 
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()
                         gGL.end();
                 }
 
-                // If this is mature, and you are not, draw a line across it
+                // As part of the AO project, we no longer want to draw access indicators;
+                // it's too complicated to get all the rules straight and will only 
+                // cause confusion.
+                /**********************
+                 // If this is mature, and you are not, draw a line across it
                 if (info->mAccess != SIM_ACCESS_DOWN
                         && info->mAccess > SIM_ACCESS_PG
                         && gAgent.isTeen())
@@ -622,6 +626,7 @@ void LLWorldMapView::draw()
                                 gGL.vertex2f(right, top);
                         gGL.end();
                 }
+                 **********************/
 
                 // Draw the region name in the lower left corner
                 LLFontGL* font = LLFontGL::sSansSerifSmall;