From 738192c930d8857d11ccbebaf62bffb7c48a8e2e Mon Sep 17 00:00:00 2001 From: Armin Weatherwax Date: Mon, 30 Nov 2009 23:38:38 +0100 Subject: Emeralds client name tag and clothing layer protection. Needs decision about a few things - find "Imprudence FIXME" (woq) in llprimitive.cpp and llvoavatar.cpp, its commented there. modified: linden/indra/llprimitive/llprimitive.cpp modified: linden/indra/llprimitive/llprimitive.h modified: linden/indra/newview/app_settings/settings.xml modified: linden/indra/newview/llagent.cpp modified: linden/indra/newview/llappviewer.cpp modified: linden/indra/newview/llfirstuse.cpp modified: linden/indra/newview/llfirstuse.h modified: linden/indra/newview/llstartup.cpp modified: linden/indra/newview/llvoavatar.cpp modified: linden/indra/newview/llvoavatar.h modified: linden/indra/newview/skins/default/xui/en-us/notifications.xml --- linden/indra/newview/llfirstuse.cpp | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'linden/indra/newview/llfirstuse.cpp') diff --git a/linden/indra/newview/llfirstuse.cpp b/linden/indra/newview/llfirstuse.cpp index bea9260..877e586 100644 --- a/linden/indra/newview/llfirstuse.cpp +++ b/linden/indra/newview/llfirstuse.cpp @@ -45,6 +45,8 @@ #include "llappviewer.h" #include "lltracker.h" +#include "llvoavatar.h" + // [RLVa:KB] - Version: 1.22.11 #include "llviewerwindow.h" // [/RLVa:KB] @@ -292,3 +294,35 @@ void LLFirstUse::useMedia() LLNotifications::instance().add("FirstMedia"); } } +void LLFirstUse::callbackClientTags(const LLSD& notification, const LLSD& response) +{ + gSavedSettings.setWarning("ClientTags", FALSE); + + S32 option = LLNotification::getSelectedOption(notification, response); + + //LLFloaterAvatarList *avlist = LLFloaterAvatarList::sInstance; + + if ( option == 0 ) + { + gSavedSettings.setBOOL("DownloadClientTags",TRUE); + //printchat("The tags will not be updated until you restart."); + //fuck that shit + LLVOAvatar::updateClientTags(); + LLVOAvatar::loadClientTags(); + //boom + //toasty + } + else if ( option == 1 ) + { + gSavedSettings.setBOOL("DownloadClientTags",FALSE); + } +} +// static +void LLFirstUse::ClientTags() +{ + if (gSavedSettings.getWarning("ClientTags")) + { + LLNotifications::instance().add("QueryClientTags", LLSD(), LLSD(), callbackClientTags); + } +} + -- cgit v1.1