diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2010-02-17 12:10:47 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2010-02-17 12:10:47 -0800 |
| commit | 62ed45b5b08ac3137c69c1c29672f2c3b8461d11 (patch) | |
| tree | 4b317e180ea6f200d7f7bcc7ae86519f96f6525c /indra/newview/llstartup.cpp | |
| parent | 479c7cb3b2c370c0ec1d58f82150aca11ed6c527 (diff) | |
| parent | 2490f50ce1bc7ffe1e53a99e4081bee13253f09a (diff) | |
Automated merge with ssh://rick@hg.lindenlab.com/q/viewer-hotfix/
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rw-r--r-- | indra/newview/llstartup.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 136989166f..fa07278cb9 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -2899,7 +2899,9 @@ bool process_login_success_response() text = response["agent_region_access"].asString(); if (!text.empty()) { - int preferredMaturity = LLAgent::convertTextToMaturity(text[0]); + U32 preferredMaturity = + llmin((U32)LLAgent::convertTextToMaturity(text[0]), + gSavedSettings.getU32("PreferredMaturity")); gSavedSettings.setU32("PreferredMaturity", preferredMaturity); } // During the AO transition, this flag will be true. Then the flag will |