diff options
| author | Chuck Linden <chuck@lindenlab.com> | 2010-02-18 21:32:53 -0500 |
|---|---|---|
| committer | Chuck Linden <chuck@lindenlab.com> | 2010-02-18 21:32:53 -0500 |
| commit | 6704b1ea7ff97cbeaca4e4a2a049c9581fb9a573 (patch) | |
| tree | 7dc425220f12a86263117772f09c75db37d84abf /indra/newview/llstartup.cpp | |
| parent | e0249da7fd8af278b286b444da96fd2b5a54354e (diff) | |
| parent | a226668381ce7866f28ff78884d73b9738a91c23 (diff) | |
Automated merge with file:///Users/chuck/Documents/hg/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 |