diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-08-24 14:52:05 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-08-24 14:52:05 +0100 |
| commit | ce1a0c6bafad092f9687e3b5a6b4865569d96863 (patch) | |
| tree | 29dafcce870eb2f494bebe2d968721abe266e930 /indra/newview/llstartup.cpp | |
| parent | d179727469692054fc100a9f1d68f181bebcd7de (diff) | |
| parent | 308d9f10147ff31752c90150bc3ee769a63837e9 (diff) | |
Final(???) merge from viewer-release to viewer-public.
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rw-r--r-- | indra/newview/llstartup.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 2475870b17..e64c4c90b7 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -2925,9 +2925,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 |