From 042341dd6f6f3369f08437614711063be048ea73 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Thu, 1 Oct 2009 01:25:26 -0700
Subject: Fixed 1.2 thinking it was on the Teen Grid

---
 linden/indra/newview/llstartup.cpp | 29 ++++++++++++++++++++++++-----
 1 file changed, 24 insertions(+), 5 deletions(-)

(limited to 'linden')

diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index 6839a4f..8ec5d98 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -1424,14 +1424,33 @@ bool idle_startup()
 			}
 			gSavedSettings.setBOOL("RememberPassword", remember_password);
 
-			text = LLUserAuth::getInstance()->getResponse("agent_access");
-			if(!text.empty() && (text[0] == 'M'))
+			// This fixes Imprudence 1.2 thinking it's a teen. 
+			// Will need updating for the 1.23 merge.
+			// this is their actual ability to access content
+			text = LLUserAuth::getInstance()->getResponse("agent_access_max");
+			if (!text.empty())
 			{
-				gAgent.setTeen(false);
+				// agent_access can be 'A', 'M', and 'PG'.
+				if (text[0] == 'PG')
+				{
+					gAgent.setTeen(true);
+				}
+				else
+				{
+					gAgent.setTeen(false);
+				}
 			}
-			else
+			else // we're on an older sim version (prolly an opensim)
 			{
-				gAgent.setTeen(true);
+				text = LLUserAuth::getInstance()->getResponse("agent_access");
+				if(!text.empty() && (text[0] == 'M'))
+				{
+					gAgent.setTeen(false);
+				}
+				else
+				{
+					gAgent.setTeen(true);
+				}
 			}
 
 			text = LLUserAuth::getInstance()->getResponse("start_location");
-- 
cgit v1.1