From 03f7086bfcc2cb23c8210ee729d35842e6ace665 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Wed, 17 Feb 2010 17:27:20 +0000 Subject: EXT-4843 [NUX] Set default Preferences 'General' pane --- indra/newview/llstartup.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'indra/newview/llstartup.cpp') 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 -- cgit v1.3 From 087d4b7bc831ba3611c023fdc9feb37b0481b0d5 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Wed, 17 Feb 2010 17:44:49 +0000 Subject: fix casts. --- indra/newview/llstartup.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/llstartup.cpp') diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index cd8051a0a9..fa07278cb9 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -2899,8 +2899,8 @@ bool process_login_success_response() text = response["agent_region_access"].asString(); if (!text.empty()) { - int preferredMaturity = - llmin(LLAgent::convertTextToMaturity(text[0]), + U32 preferredMaturity = + llmin((U32)LLAgent::convertTextToMaturity(text[0]), gSavedSettings.getU32("PreferredMaturity")); gSavedSettings.setU32("PreferredMaturity", preferredMaturity); } -- cgit v1.3 From 79f05f9d279dc72c795ecaca6a51f976667962ae Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Sun, 21 Feb 2010 12:46:40 +0000 Subject: Remove a linux-specific #include that we don't actually use. --- indra/newview/llstartup.cpp | 4 ---- 1 file changed, 4 deletions(-) (limited to 'indra/newview/llstartup.cpp') diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index fa07278cb9..83f773fadc 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -200,10 +200,6 @@ #include "lldxhardware.h" #endif -#if (LL_LINUX || LL_SOLARIS) && LL_GTK -#include -#endif - // // exported globals // -- cgit v1.3 From 8bf9bc2dc7e7af3e229ba6c02bdabdf1aa82ba71 Mon Sep 17 00:00:00 2001 From: Vadim Savchuk Date: Tue, 23 Feb 2010 18:10:35 +0200 Subject: Removed an unnecessary include. --HG-- branch : product-engine --- indra/newview/llstartup.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'indra/newview/llstartup.cpp') diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 83f773fadc..025dd6029a 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -121,7 +121,6 @@ #include "lllogininstance.h" // Host the login module. #include "llpanellogin.h" #include "llmutelist.h" -#include "llpanelavatar.h" #include "llavatarpropertiesprocessor.h" #include "llfloaterevent.h" #include "llpanelclassified.h" -- cgit v1.3