3 files changed, 30 insertions, 9 deletions
diff --git a/indra/llui/llfolderviewitem.cpp b/indra/llui/llfolderviewitem.cpp
index 0131ab1085..03e3c84ca1 100644
--- a/indra/llui/llfolderviewitem.cpp
+++ b/indra/llui/llfolderviewitem.cpp
@@ -767,17 +767,14 @@ void LLFolderViewItem::drawOpenFolderArrow(const Params& default_params, const L
 void LLFolderViewItem::drawFavoriteIcon(const Params& default_params, const LLUIColor& fg_color)
 {
     static LLUICachedControl<bool> draw_star("InventoryFavoritesUseStar", true);
-    if (!draw_star)
-    {
-        return;
-    }
+    static LLUICachedControl<bool> draw_hollow_star("InventoryFavoritesUseHollowStar", true);
     
     LLUIImage* favorite_image = NULL; 
-    if (mIsFavorite)
+    if (draw_star && mIsFavorite)
     {
         favorite_image = default_params.favorite_image;
     }
-    else if (mHasFavorites && !isOpen())
+    else if (draw_hollow_star && mHasFavorites && !isOpen())
     {
         favorite_image = default_params.favorite_content_image;
     }
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 565d20daa1..a37b334a22 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -17438,6 +17438,17 @@
     <key>Value</key>
     <integer>1</integer>
   </map>
+  <key>InventoryFavoritesUseHollowStar</key>
+  <map>
+    <key>Comment</key>
+    <string>Show star near folders that contain favorites</string>
+    <key>Persist</key>
+    <integer>0</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>1</integer>
+  </map>
   <key>InventoryFavoritesColorText</key>
   <map>
     <key>Comment</key>
diff --git a/indra/newview/skins/default/xui/en/floater_inventory_settings.xml b/indra/newview/skins/default/xui/en/floater_inventory_settings.xml
index e027d7556f..08b7a7af05 100644
--- a/indra/newview/skins/default/xui/en/floater_inventory_settings.xml
+++ b/indra/newview/skins/default/xui/en/floater_inventory_settings.xml
@@ -4,8 +4,8 @@
  can_minimize="true"
  can_resize="false"
  save_rect="true"
- height="460"
- width="460"
+ height="483"
+ width="483"
  name="inventory_settings"
  title="INVENTORY SETTINGS">
  <icon
@@ -210,11 +210,24 @@
    left="60"
    width="300"
    height="18"
-   label="Star"
+   label="Star on favorite items"
    name="favorite_star"
    label_text.text_color="White"
    initial_value="false"/>
   <check_box
+   control_name="InventoryFavoritesUseHollowStar"
+   follows="left|top"
+   top_pad="5"
+   layout="topleft"
+   font="SansSerifMedium"
+   left="60"
+   width="150"
+   height="18"
+   label="Star on folders containing a favorite"
+   name="favorite_hollow_star"
+   label_text.text_color="White"
+   initial_value="false"/>
+  <check_box
    control_name="InventoryFavoritesColorText"
    follows="left|top"
    top_pad="5"