From 953d99cded128041fbd98fbb81607ce5b2afc2c9 Mon Sep 17 00:00:00 2001 From: Tonya Souther Date: Wed, 9 Jan 2013 03:00:28 -0600 Subject: [PATCH] FIRE-8854: Set default access level to maximum if the sim doesn't set it at login. OpenSim fix. --- indra/newview/llstartup.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 14184ec345..0cf20e1886 100755 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -3601,6 +3601,11 @@ bool process_login_success_response(U32 &first_sim_size_x, U32 &first_sim_size_y { // agent_access can be 'A', 'M', and 'PG'. gAgent.setMaturity(text[0]); + // FIRE-8854: Set the preferred maturity here to the maximum + // in case the sim doesn't send it at login, like OpenSim + // doesn't. If it does, it'll get overridden below. + U32 preferredMaturity = (U32)LLAgent::convertTextToMaturity(text[0]); + gSavedSettings.setU32("PreferredMaturity", preferredMaturity); } // this is the value of their preference setting for that content @@ -3609,7 +3614,6 @@ bool process_login_success_response(U32 &first_sim_size_x, U32 &first_sim_size_y if (!text.empty()) { U32 preferredMaturity = (U32)LLAgent::convertTextToMaturity(text[0]); - gSavedSettings.setU32("PreferredMaturity", preferredMaturity); }