diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-17 17:27:20 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-17 17:27:20 +0000 |
| commit | 03f7086bfcc2cb23c8210ee729d35842e6ace665 (patch) | |
| tree | 51a08121709aa2a3247d0820ea11ce068a933b15 /indra/newview/llstartup.cpp | |
| parent | 33a3a0d156c3664dc9a61353c7b63f9343b0d1f5 (diff) | |
EXT-4843 [NUX] Set default Preferences
'General' pane
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..cd8051a0a9 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]); + int preferredMaturity = + llmin(LLAgent::convertTextToMaturity(text[0]), + gSavedSettings.getU32("PreferredMaturity")); gSavedSettings.setU32("PreferredMaturity", preferredMaturity); } // During the AO transition, this flag will be true. Then the flag will |