diff options
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llface.h | 2 | ||||
| -rw-r--r-- | indra/newview/llstartup.cpp | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/indra/newview/llface.h b/indra/newview/llface.h index 8f17bc3178..13d3d8824e 100644 --- a/indra/newview/llface.h +++ b/indra/newview/llface.h @@ -214,7 +214,7 @@ private: BOOL calcPixelArea(F32& cos_angle_to_view_dir, F32& radius) ; public: static F32 calcImportanceToCamera(F32 to_view_dir, F32 dist); - static F32 LLFace::adjustPixelArea(F32 importance, F32 pixel_area) ; + static F32 adjustPixelArea(F32 importance, F32 pixel_area) ; public: diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 96088fed9c..3aad39bcbf 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -2933,9 +2933,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 |