From 71657b66f99301a602c7915b70b8b395902bf6ac Mon Sep 17 00:00:00 2001 From: Andrey Lihatskiy Date: Fri, 27 Jan 2023 22:04:11 +0200 Subject: [PATCH 1/2] Revert "SL-18581 Don't show the starter avatar toolbar button for NUX" This reverts commit 4d429b7ea31f51f653e0e2ad6b5799a515e28334. --- indra/newview/lltoolbarview.cpp | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/indra/newview/lltoolbarview.cpp b/indra/newview/lltoolbarview.cpp index 752fc6f3f3..01d799dcd5 100644 --- a/indra/newview/lltoolbarview.cpp +++ b/indra/newview/lltoolbarview.cpp @@ -44,7 +44,6 @@ #include "llagent.h" // HACK for destinations guide on startup #include "llfloaterreg.h" // HACK for destinations guide on startup #include "llviewercontrol.h" // HACK for destinations guide on startup -#include "llinventorymodel.h" // HACK to disable starter avatars button for NUX #include @@ -320,22 +319,6 @@ bool LLToolBarView::loadToolbars(bool force_default) } } } - - // SL-18581: Don't show the starter avatar toolbar button for NUX users - LLViewerInventoryCategory* my_outfits_cat = gInventory.getCategory(gInventory.findCategoryUUIDForType(LLFolderType::FT_MY_OUTFITS)); - if (gAgent.isFirstLogin() - && my_outfits_cat != NULL - && my_outfits_cat->getDescendentCount() > 0) - { - for (S32 i = LLToolBarEnums::TOOLBAR_FIRST; i <= LLToolBarEnums::TOOLBAR_LAST; i++) - { - if (mToolbars[i]) - { - mToolbars[i]->removeCommand(LLCommandId("avatar")); - } - } - } - mToolbarsLoaded = true; return true; } From 8d21d29bd7fa038db632ff90fb0e1207d0713ca2 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Thu, 2 Feb 2023 14:33:39 -0500 Subject: [PATCH 2/2] Increment viewer version to 6.6.10 following promotion of DRTVWR-570 --- indra/newview/VIEWER_VERSION.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/VIEWER_VERSION.txt b/indra/newview/VIEWER_VERSION.txt index f5199477c5..0673dfa857 100644 --- a/indra/newview/VIEWER_VERSION.txt +++ b/indra/newview/VIEWER_VERSION.txt @@ -1 +1 @@ -6.6.9 +6.6.10