diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2010-02-17 14:01:35 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2010-02-17 14:01:35 -0800 |
| commit | 50e696872ecebd37e8a43df3031e4cdaf26147a9 (patch) | |
| tree | 7a0eadbb49db2b1d37306c89e588d2ae64510145 /indra/newview/llstartup.cpp | |
| parent | 1c0603bef2bac6e006df7566aa2a3f8c351a1b7f (diff) | |
| parent | 5fd3f8e61c9c37c4cf6a1aabc11f2f9ee710053f (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 |