3 files changed, 51 insertions, 2 deletions

diff --git a/indra/llui/llfolderviewitem.cpp b/indra/llui/llfolderviewitem.cpp
index 2bd14f6f6a..84146e5829 100644
--- a/indra/llui/llfolderviewitem.cpp
+++ b/indra/llui/llfolderviewitem.cpp
@@ -99,6 +99,8 @@ void LLFolderViewItem::cleanupClass()
 LLFolderViewItem::Params::Params()
 :	root(),
 	listener(),
+    favorite_image("favorite_image"),
+    favorite_content_image("favorite_content_image"),
 	folder_arrow_image("folder_arrow_image"),
 	folder_indentation("folder_indentation"),
 	selection_image("selection_image"),
@@ -125,6 +127,8 @@ LLFolderViewItem::LLFolderViewItem(const LLFolderViewItem::Params& p)
 :	LLView(p),
 	mLabelWidth(0),
 	mLabelWidthDirty(false),
+    mIsFavorite(false),
+    mHasFavorites(false),
     mSuffixNeedsRefresh(false),
     mLabelPaddingRight(DEFAULT_LABEL_PADDING_RIGHT),
 	mParentFolder( NULL ),
@@ -194,6 +198,8 @@ BOOL LLFolderViewItem::postBuild()
         // getDisplayName() is expensive (due to internal getLabelSuffix() and name building)
         // it also sets search strings so it requires a filter reset
         mLabel = vmi->getDisplayName();
+        mIsFavorite = vmi->isFavorite();
+        mHasFavorites = vmi->hasFavorites();
         setToolTip(vmi->getName());
 
         // Dirty the filter flag of the model from the view (CHUI-849)
@@ -307,6 +313,8 @@ void LLFolderViewItem::refresh()
     LLFolderViewModelItem& vmi = *getViewModelItem();
 
     mLabel = vmi.getDisplayName();
+    mIsFavorite = vmi.isFavorite();
+    mHasFavorites = vmi.hasFavorites();
     setToolTip(vmi.getName());
     // icons are slightly expensive to get, can be optimized
     // see LLInventoryIcon::getIcon()
@@ -339,6 +347,9 @@ void LLFolderViewItem::refreshSuffix()
     mIconOpen = vmi->getIconOpen();
     mIconOverlay = vmi->getIconOverlay();
 
+    mIsFavorite = vmi->isFavorite();
+    mHasFavorites = vmi->hasFavorites();
+
 	if (mRoot->useLabelSuffix())
 	{
         // Very Expensive!
@@ -754,6 +765,29 @@ void LLFolderViewItem::drawOpenFolderArrow(const Params& default_params, const L
 	}
 }
 
+void LLFolderViewItem::drawFavoriteIcon(const Params& default_params, const LLUIColor& fg_color)
+{
+    LLUIImage* favorite_image = NULL; 
+    if (mIsFavorite)
+    {
+        favorite_image = default_params.favorite_image;
+    }
+    else if (mHasFavorites)
+    {
+        favorite_image = default_params.favorite_content_image;
+    }
+
+    if (favorite_image)
+    {
+        const S32 PAD = 2;
+        const S32 image_size = 30;
+        
+        gl_draw_scaled_image(
+            getRect().getWidth() - image_size - PAD, getRect().getHeight() - mItemHeight + PAD,
+            image_size, image_size, favorite_image->getImage(), fg_color);
+    }
+}
+
 /*virtual*/ bool LLFolderViewItem::isHighlightAllowed()
 {
 	return mIsSelected;
@@ -913,6 +947,7 @@ void LLFolderViewItem::draw()
     {
         drawOpenFolderArrow(default_params, sFgColor);
     }
+    drawFavoriteIcon(default_params, sFgColor);
 
     drawHighlight(show_context, filled, sHighlightBgColor, sFlashBgColor, sFocusOutlineColor, sMouseOverColor);
 
diff --git a/indra/llui/llfolderviewitem.h b/indra/llui/llfolderviewitem.h
index 5c2a1ecff0..eba3cf4f83 100644
--- a/indra/llui/llfolderviewitem.h
+++ b/indra/llui/llfolderviewitem.h
@@ -49,7 +49,9 @@ class LLFolderViewItem : public LLView
 public:
 	struct Params : public LLInitParam::Block<Params, LLView::Params>
 	{
-		Optional<LLUIImage*>						folder_arrow_image,
+		Optional<LLUIImage*>						favorite_image,
+													favorite_content_image,
+													folder_arrow_image,
 													selection_image;
 		Mandatory<LLFolderView*>					root;
 		Mandatory<LLFolderViewModelItem*>			listener;
@@ -92,6 +94,8 @@ protected:
 	std::string					mLabel;
 	S32							mLabelWidth;
 	bool						mLabelWidthDirty;
+    bool						mIsFavorite;
+    bool						mHasFavorites;
     S32                         mLabelPaddingRight;
 	LLFolderViewFolder*			mParentFolder;
 	LLPointer<LLFolderViewModelItem> mViewModelItem;
@@ -207,6 +211,8 @@ public:
 	// Returns true is this object and all of its children can be moved
 	virtual BOOL isMovable();
 
+    bool isFavorite() const { return mIsFavorite; }
+
 	// destroys this item recursively
 	virtual void destroyView();
 
@@ -297,6 +303,7 @@ public:
 	//	virtual void handleDropped();
 	virtual void draw();
 	void drawOpenFolderArrow(const Params& default_params, const LLUIColor& fg_color);
+    void drawFavoriteIcon(const Params& default_params, const LLUIColor& fg_color);
     void drawHighlight(const BOOL showContent, const 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,
@@ -391,6 +398,10 @@ public:
 	// Returns true is this object and all of its children can be moved
 	virtual BOOL isMovable();
 
+    bool isFavorite() const { return mIsFavorite; }
+    bool hasFavorites() const { return mHasFavorites; }
+    void setHasFavorites(bool val) { mHasFavorites = val; }
+
 	// destroys this folder, and all children
 	virtual void destroyView();
     void destroyRoot();
diff --git a/indra/llui/llfolderviewmodel.h b/indra/llui/llfolderviewmodel.h
index 551a60e097..9d46334fc4 100644
--- a/indra/llui/llfolderviewmodel.h
+++ b/indra/llui/llfolderviewmodel.h
@@ -161,7 +161,10 @@ public:
 	virtual void selectItem(void) = 0;
 
     virtual void navigateToFolder(bool new_window = false, bool change_mode = false) = 0;
-    
+
+    virtual bool isFavorite() const = 0;
+    virtual bool hasFavorites() const = 0;
+    virtual void setHasFavorites(bool val) = 0;
     virtual BOOL isItemWearable() const { return FALSE; }
 
 	virtual BOOL isItemRenameable() const = 0;