diff options
| author | Richard Linden <none@none> | 2010-08-26 12:49:00 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-08-26 12:49:00 -0700 |
| commit | 093e83386d5a132cc8947095f93ea6405aab6e3f (patch) | |
| tree | 043184fa92c8a6a9f8e747eb13056616bb27ba20 /indra/newview/llstartup.cpp | |
| parent | 2667c77a1cfb230ade472a047f46fd2bde7883c0 (diff) | |
| parent | ce1a0c6bafad092f9687e3b5a6b4865569d96863 (diff) | |
merge
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rw-r--r-- | indra/newview/llstartup.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index f6f70f5a43..0f340e885a 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -2918,9 +2918,8 @@ bool process_login_success_response() text = response["agent_region_access"].asString(); if (!text.empty()) { - U32 preferredMaturity = - llmin((U32)LLAgent::convertTextToMaturity(text[0]), - gSavedSettings.getU32("PreferredMaturity")); + U32 preferredMaturity = (U32)LLAgent::convertTextToMaturity(text[0]); + gSavedSettings.setU32("PreferredMaturity", preferredMaturity); } // During the AO transition, this flag will be true. Then the flag will |