Merge branch '1.3.0-clienttags' into next

1 files changed, 34 insertions, 0 deletions

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);
+        }
+}
+