diff options
| author | Monroe Linden <monroe@lindenlab.com> | 2010-02-18 15:22:10 -0800 |
|---|---|---|
| committer | Monroe Linden <monroe@lindenlab.com> | 2010-02-18 15:22:10 -0800 |
| commit | 890ec637d41330a2a91d23b09b6aaaf49738d19a (patch) | |
| tree | b093f98112fb0cfdcad5452df1b266f1e0052fc0 /indra/newview/llstartup.cpp | |
| parent | 1d1e4c7abe5c46cfafbc351e8cad3197d2befefc (diff) | |
| parent | 4ab945c9f0000ead1eca22eefe0829bf3c15d7da (diff) | |
Automated merge with ssh://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 |