From 81d3f7ec6b348a08ad8c330d8d9ba90cd10ee816 Mon Sep 17 00:00:00 2001 From: brad kittenbrink Date: Mon, 31 Aug 2009 20:00:09 -0400 Subject: Post-merge cleanups (ported llstartup.cpp changes to where the surrounding code has been moved to in LLLoginInstance and LLAppViewer) --- indra/newview/lllogininstance.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'indra/newview/lllogininstance.cpp') diff --git a/indra/newview/lllogininstance.cpp b/indra/newview/lllogininstance.cpp index cb7dbc2de0..2f4d00786c 100644 --- a/indra/newview/lllogininstance.cpp +++ b/indra/newview/lllogininstance.cpp @@ -137,6 +137,7 @@ void LLLoginInstance::constructAuthParams(const LLSD& credentials) requested_options.append("event_categories"); requested_options.append("event_notifications"); requested_options.append("classified_categories"); + requested_options.append("adult_compliant"); //requested_options.append("inventory-targets"); requested_options.append("buddy-list"); requested_options.append("ui-config"); @@ -345,8 +346,10 @@ void LLLoginInstance::updateApp(bool mandatory, const std::string& auth_msg) #if LL_WINDOWS notification_name += "Windows"; -#else - notification_name += "Mac"; +#elif LL_DARWIN + notification_name += "Mac"; +#else + notification_name += "Linux"; #endif if (mandatory) -- cgit v1.2.3