summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorSergei Litovchuk <slitovchuk@productengine.com>2010-08-17 17:09:23 +0300
committerSergei Litovchuk <slitovchuk@productengine.com>2010-08-17 17:09:23 +0300
commitbbf4bc88b827b1a4f51e032cecca892430236d97 (patch)
treeb67bbf469f1cc5d4a228a52ba72f8d652095858b /indra
parentcc93aa8d6e3aac2b98b02823c253c637b1a9b94e (diff)
EXT-7083 FIXED initializing the viewer preferred maturity with the value received from the server on login.
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/863/. --HG-- branch : product-engine
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llstartup.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 96088fed9c..3aad39bcbf 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -2933,9 +2933,8 @@ bool process_login_success_response()
text = response["agent_region_access"].asString();
if (!text.empty())
{
- U32 preferredMaturity =
- llmin((U32)LLAgent::convertTextToMaturity(text[0]),
- gSavedSettings.getU32("PreferredMaturity"));
+ U32 preferredMaturity = (U32)LLAgent::convertTextToMaturity(text[0]);
+
gSavedSettings.setU32("PreferredMaturity", preferredMaturity);
}
// During the AO transition, this flag will be true. Then the flag will