Apply changes from 55f2103adc36db0d3f068a31a144e15465226e13 to LLFolderViewItem::drawFavoriteIcon (#2867)

# Conflicts:
#	indra/llui/llfolderviewitem.cpp

2 files changed, 17 insertions, 11 deletions

diff --git a/indra/llui/llfolderviewitem.cpp b/indra/llui/llfolderviewitem.cpp
index c58180a147..c39613b1b5 100644
--- a/indra/llui/llfolderviewitem.cpp
+++ b/indra/llui/llfolderviewitem.cpp
@@ -61,6 +61,8 @@ LLUIColor LLFolderViewItem::sSearchStatusColor;
 S32 LLFolderViewItem::sTopPad = 0;
 LLUIImagePtr LLFolderViewItem::sFolderArrowImg;
 LLUIImagePtr LLFolderViewItem::sSelectionImg;
+LLUIImagePtr LLFolderViewItem::sFavoriteImg;
+LLUIImagePtr LLFolderViewItem::sFavoriteContentImg;
 LLFontGL* LLFolderViewItem::sSuffixFont = nullptr;
 LLUIColor LLFolderViewItem::sFavoriteColor;
 bool LLFolderViewItem::sColorSetInitialized = false;
@@ -105,6 +107,8 @@ void LLFolderViewItem::initClass()
     sTopPad = default_params.item_top_pad;
     sFolderArrowImg = default_params.folder_arrow_image;
     sSelectionImg = default_params.selection_image;
+    sFavoriteImg = default_params.favorite_image;
+    sFavoriteContentImg = default_params.favorite_content_image;
     sSuffixFont = getLabelFontForStyle(LLFontGL::NORMAL);
 
     sFgColor = LLUIColorTable::instance().getColor("MenuItemEnabledColor", DEFAULT_WHITE);
@@ -124,6 +128,8 @@ void LLFolderViewItem::cleanupClass()
     sFonts.clear();
     sFolderArrowImg = nullptr;
     sSelectionImg = nullptr;
+    sFavoriteImg = nullptr;
+    sFavoriteContentImg = nullptr;
     sSuffixFont = nullptr;
 }
 
@@ -802,29 +808,29 @@ void LLFolderViewItem::drawOpenFolderArrow()
     }
 }
 
-void LLFolderViewItem::drawFavoriteIcon(const Params& default_params, const LLUIColor& fg_color)
+void LLFolderViewItem::drawFavoriteIcon()
 {
     static LLUICachedControl<bool> draw_star("InventoryFavoritesUseStar", true);
     static LLUICachedControl<bool> draw_hollow_star("InventoryFavoritesUseHollowStar", true);
 
-    LLUIImage* favorite_image = NULL;
+    LLUIImage* favorite_image = nullptr;
     if (draw_star && mIsFavorite)
     {
-        favorite_image = default_params.favorite_image;
+        favorite_image = sFavoriteImg;
     }
     else if (draw_hollow_star && mHasFavorites && !isOpen())
     {
-        favorite_image = default_params.favorite_content_image;
+        favorite_image = sFavoriteContentImg;
     }
 
     if (favorite_image)
     {
-        const S32 PAD = 3;
-        const S32 image_size = 14;
+        constexpr S32 PAD = 3;
+        constexpr S32 image_size = 14;
 
         gl_draw_scaled_image(
             getRect().getWidth() - image_size - PAD, getRect().getHeight() - mItemHeight + PAD,
-            image_size, image_size, favorite_image->getImage(), fg_color);
+            image_size, image_size, favorite_image->getImage(), sFgColor);
     }
 }
 
@@ -985,9 +991,7 @@ void LLFolderViewItem::draw()
     {
         drawOpenFolderArrow();
     }
-
-    const Params& default_params = LLUICtrlFactory::getDefaultParams<LLFolderViewItem>();
-    drawFavoriteIcon(default_params, sFgColor);
+    drawFavoriteIcon();
 
     drawHighlight(show_context, filled, sHighlightBgColor, sFlashBgColor, sFocusOutlineColor, sMouseOverColor);
 
diff --git a/indra/llui/llfolderviewitem.h b/indra/llui/llfolderviewitem.h
index 024115a96f..ffc2efd3a7 100644
--- a/indra/llui/llfolderviewitem.h
+++ b/indra/llui/llfolderviewitem.h
@@ -307,7 +307,7 @@ public:
     //  virtual void handleDropped();
     virtual void draw();
     void drawOpenFolderArrow();
-    void drawFavoriteIcon(const Params& default_params, const LLUIColor& fg_color);
+    void drawFavoriteIcon();
     void drawHighlight(bool showContent, bool hasKeyboardFocus, const LLUIColor& selectColor, const LLUIColor& flashColor, const LLUIColor& outlineColor, const LLUIColor& mouseOverColor);
     void drawLabel(const LLFontGL* font, const F32 x, const F32 y, const LLColor4& color, F32 &right_x);
     virtual bool handleDragAndDrop(S32 x, S32 y, MASK mask, bool drop,
@@ -321,6 +321,8 @@ private:
     static S32 sTopPad;
     static LLUIImagePtr sFolderArrowImg;
     static LLUIImagePtr sSelectionImg;
+    static LLUIImagePtr sFavoriteImg;
+    static LLUIImagePtr sFavoriteContentImg;
     static LLFontGL* sSuffixFont;
 
     LLFontVertexBuffer mLabelFontBuffer;