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 --- ChangeLog.txt | 6 ++++++ linden/indra/newview/llstartup.cpp | 29 ++++++++++++++++++++++++----- 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index ab240dd..34dbd34 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,5 +1,11 @@ 2009-10-01 McCabe Maxsted + * Fixed 1.2 thinking it was on the Teen Grid. + (And also accidentally made us adult compliant! Hah!) + + modified: indra/newview/llstartup.cpp + + * Updated gpu_table.txt to latest version in Snowglobe. modified: linden/indra/newview/gpu_table.txt 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