From 7afa8058aae0d5363cc19c7df1e6d2d7ec3bf7ac Mon Sep 17 00:00:00 2001
From: Josh Bell <josh@lindenlab.com>
Date: Thu, 1 Nov 2007 22:02:35 +0000
Subject: svn merge -r 72652:72881
 svn+ssh://svn.lindenlab.com/svn/linden/branches/sl-search-11 --> release

QAR-11: pair-reviewed the merge w/ Sam.
---
 indra/newview/llworldmapview.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'indra/newview/llworldmapview.cpp')

diff --git a/indra/newview/llworldmapview.cpp b/indra/newview/llworldmapview.cpp
index 08d8aade87..188591d1f9 100644
--- a/indra/newview/llworldmapview.cpp
+++ b/indra/newview/llworldmapview.cpp
@@ -621,7 +621,9 @@ void LLWorldMapView::draw()
 		}
 
 		// If this is mature, and you are not, draw a line across it
-		if (info->mAccess != SIM_ACCESS_DOWN && info->mAccess > gAgent.mAccess)
+		if (info->mAccess != SIM_ACCESS_DOWN
+			&& info->mAccess > SIM_ACCESS_PG
+			&& gAgent.isTeen())
 		{
 			glBlendFunc(GL_DST_ALPHA, GL_ZERO);
 			
-- 
cgit v1.2.3