diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-17 18:54:47 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-17 18:54:47 +0000 |
| commit | b31d7cb22f1ab51428bdfbae6d252d7c22167b7a (patch) | |
| tree | 0202d447218fade13c7e9f87972d7c4966174d47 /indra/newview/llstartup.cpp | |
| parent | 2398ac98d01d3809904759251e2c98cf2740e139 (diff) | |
| parent | 2490f50ce1bc7ffe1e53a99e4081bee13253f09a (diff) | |
merge from viewer2.
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 |