diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-01-27 22:04:11 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-01-27 22:04:11 +0200 |
| commit | 71657b66f99301a602c7915b70b8b395902bf6ac (patch) | |
| tree | d8c4fd6edce45ceeca8eb857d0ddd9b992fa1db3 /indra/newview | |
| parent | b3201e75b1908dd5186d6561b6706f2cc07c92c3 (diff) | |
Revert "SL-18581 Don't show the starter avatar toolbar button for NUX"
This reverts commit 4d429b7ea31f51f653e0e2ad6b5799a515e28334.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/lltoolbarview.cpp | 17 |
1 files changed, 0 insertions, 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 <boost/foreach.hpp> @@ -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; } |