Merge commit 'a0b0f20777' into marchcat/c-develop

# Conflicts:
#	indra/newview/llinventorybridge.cpp

8 files changed, 100 insertions, 13 deletions

diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 2deb7caad5..58667aba66 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -2281,6 +2281,21 @@ const LLUUID& LLItemBridge::getThumbnailUUID() const
     return LLUUID::null;
 }
 
+bool LLItemBridge::getIsFavorite() const
+{
+    LLViewerInventoryItem* item = NULL;
+    LLInventoryModel* model = getInventoryModel();
+    if(model)
+    {
+        item = (LLViewerInventoryItem*)model->getItem(mUUID);
+    }
+    if (item)
+    {
+        return item->getIsFavorite();
+    }
+    return false;
+}
+
 // virtual
 bool LLItemBridge::isItemPermissive() const
 {
@@ -2426,6 +2441,16 @@ const LLUUID& LLFolderBridge::getThumbnailUUID() const
     return LLUUID::null;
 }
 
+bool LLFolderBridge::getIsFavorite() const
+{
+    LLViewerInventoryCategory* cat = getCategory();
+    if (cat)
+    {
+        return cat->getIsFavorite();
+    }
+    return false;
+}
+
 void LLFolderBridge::update()
 {
     // we know we have children but  haven't  fetched them (doesn't obey filter)
diff --git a/indra/newview/llinventorybridge.h b/indra/newview/llinventorybridge.h
index 3e7f74384b..da61a2ac55 100644
--- a/indra/newview/llinventorybridge.h
+++ b/indra/newview/llinventorybridge.h
@@ -86,6 +86,7 @@ public:
     //--------------------------------------------------------------------
     virtual const LLUUID& getUUID() const { return mUUID; }
     virtual const LLUUID& getThumbnailUUID() const { return LLUUID::null; }
+    virtual bool getIsFavorite() const { return false; }
     virtual void clearDisplayName() { mDisplayName.clear(); }
     virtual void restoreItem() {}
     virtual void restoreToWorld() {}
@@ -259,6 +260,7 @@ public:
 
     LLViewerInventoryItem* getItem() const;
     virtual const LLUUID& getThumbnailUUID() const;
+    virtual bool getIsFavorite() const;
 
 protected:
     bool confirmRemoveItem(const LLSD& notification, const LLSD& response);
@@ -301,6 +303,7 @@ public:
     virtual std::string getLabelSuffix() const;
     virtual LLFontGL::StyleFlags getLabelStyle() const;
     virtual const LLUUID& getThumbnailUUID() const;
+    virtual bool getIsFavorite() const;
 
     void setShowDescendantsCount(bool show_count) {mShowDescendantsCount = show_count;}
 
diff --git a/indra/newview/llinventoryfilter.cpp b/indra/newview/llinventoryfilter.cpp
index 01f2c6c525..1a3c9c711a 100644
--- a/indra/newview/llinventoryfilter.cpp
+++ b/indra/newview/llinventoryfilter.cpp
@@ -64,6 +64,7 @@ LLInventoryFilter::FilterOps::FilterOps(const Params& p)
     mFilterUUID(p.uuid),
     mFilterLinks(p.links),
     mFilterThumbnails(p.thumbnails),
+    mFilterFavorites(p.favorites),
     mSearchVisibility(p.search_visibility)
 {
 }
@@ -611,6 +612,19 @@ bool LLInventoryFilter::checkAgainstFilterThumbnails(const LLUUID& object_id) co
     return true;
 }
 
+bool LLInventoryFilter::checkAgainstFilterFavorites(const LLUUID& object_id) const
+{
+    const LLInventoryObject* object = gInventory.getObject(object_id);
+    if (!object) return true;
+
+    const bool is_favorite = object->getIsFavorite();
+    if (is_favorite && (mFilterOps.mFilterFavorites == FILTER_EXCLUDE_FAVORITES))
+        return false;
+    if (!is_favorite && (mFilterOps.mFilterFavorites == FILTER_ONLY_FAVORITES))
+        return false;
+    return true;
+}
+
 bool LLInventoryFilter::checkAgainstCreator(const LLFolderViewModelItemInventory* listener) const
 {
     if (!listener)
@@ -811,6 +825,32 @@ void LLInventoryFilter::setFilterThumbnails(U64 filter_thumbnails)
     mFilterOps.mFilterThumbnails = filter_thumbnails;
 }
 
+void LLInventoryFilter::setFilterFavorites(U64 filter_favorites)
+{
+    if (mFilterOps.mFilterFavorites != filter_favorites)
+    {
+        if (mFilterOps.mFilterFavorites == FILTER_EXCLUDE_FAVORITES
+            && filter_favorites == FILTER_ONLY_FAVORITES)
+        {
+            setModified(FILTER_RESTART);
+        }
+        else if (mFilterOps.mFilterFavorites == FILTER_ONLY_FAVORITES
+            && filter_favorites == FILTER_EXCLUDE_FAVORITES)
+        {
+            setModified(FILTER_RESTART);
+        }
+        else if (mFilterOps.mFilterFavorites == FILTER_INCLUDE_FAVORITES)
+        {
+            setModified(FILTER_MORE_RESTRICTIVE);
+        }
+        else
+        {
+            setModified(FILTER_LESS_RESTRICTIVE);
+        }
+    }
+    mFilterOps.mFilterFavorites = filter_favorites;
+}
+
 void LLInventoryFilter::setFilterEmptySystemFolders()
 {
     mFilterOps.mFilterTypes |= FILTERTYPE_EMPTYFOLDERS;
@@ -1615,6 +1655,11 @@ U64 LLInventoryFilter::getFilterThumbnails() const
     return mFilterOps.mFilterThumbnails;
 }
 
+U64 LLInventoryFilter::getFilterFavorites() const
+{
+    return mFilterOps.mFilterFavorites;
+}
+
 bool LLInventoryFilter::hasFilterString() const
 {
     return mFilterSubString.size() > 0;
diff --git a/indra/newview/llinventoryfilter.h b/indra/newview/llinventoryfilter.h
index 612a161ba2..937864bbfa 100644
--- a/indra/newview/llinventoryfilter.h
+++ b/indra/newview/llinventoryfilter.h
@@ -83,6 +83,13 @@ public:
         FILTER_ONLY_THUMBNAILS
     };
 
+    enum EFilterFavorite
+    {
+        FILTER_INCLUDE_FAVORITES,
+        FILTER_EXCLUDE_FAVORITES,
+        FILTER_ONLY_FAVORITES
+    };
+
     enum ESortOrderType
     {
         SO_NAME = 0,                        // Sort inventory by name
@@ -149,6 +156,7 @@ public:
             Optional<PermissionMask>    permissions;
             Optional<EFilterCreatorType> creator_type;
             Optional<EFilterThumbnail> thumbnails;
+            Optional<EFilterFavorite> favorites;
 
             Params()
             :   types("filter_types", FILTERTYPE_OBJECT),
@@ -156,6 +164,7 @@ public:
                 wearable_types("wearable_types", 0xffffFFFFffffFFFFULL),
                 settings_types("settings_types", 0xffffFFFFffffFFFFULL),
                 thumbnails("thumbnails", FILTER_INCLUDE_THUMBNAILS),
+                favorites("favorites", FILTER_INCLUDE_FAVORITES),
                 category_types("category_types", 0xffffFFFFffffFFFFULL),
                 links("links", FILTERLINK_INCLUDE_LINKS),
                 search_visibility("search_visibility", 0xFFFFFFFF),
@@ -177,6 +186,7 @@ public:
                         mFilterWearableTypes,
                         mFilterSettingsTypes, // for _SETTINGS
                         mFilterThumbnails,
+                        mFilterFavorites,
                         mFilterLinks,
                         mFilterCategoryTypes; // For _CATEGORY
         LLUUID          mFilterUUID;          // for UUID
@@ -220,6 +230,7 @@ public:
     U64                 getFilterSettingsTypes() const;
     U64                 getSearchVisibilityTypes() const;
     U64                 getFilterThumbnails() const;
+    U64                 getFilterFavorites() const;
 
     bool                isFilterObjectTypesWith(LLInventoryType::EType t) const;
     void                setFilterObjectTypes(U64 types);
@@ -235,6 +246,7 @@ public:
     void                setFilterMarketplaceListingFolders(bool select_only_listing_folders);
     void                setFilterNoMarketplaceFolder();
     void                setFilterThumbnails(U64 filter_thumbnails);
+    void                setFilterFavorites(U64 filter_favorites);
     void                updateFilterTypes(U64 types, U64& current_types);
     void                setSearchType(ESearchType type);
     ESearchType         getSearchType() { return mSearchType; }
@@ -339,6 +351,7 @@ public:
     LLInventoryFilter& operator =(const LLInventoryFilter& other);
 
     bool checkAgainstFilterThumbnails(const LLUUID& object_id) const;
+    bool checkAgainstFilterFavorites(const LLUUID& object_id) const;
 
 private:
     bool                areDateLimitsSet() const;
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index 2449a226c3..ee7a26ddd2 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -2773,8 +2773,9 @@ bool LLInventoryModel::loadSkeleton(
                     cached_ids.insert(tcat->getUUID());
 
                     // At the moment download does not provide a thumbnail
-                    // uuid, use the one from cache
+                    // uuid or favorite, use values from cache
                     tcat->setThumbnailUUID(cat->getThumbnailUUID());
+                    tcat->setFavorite(cat->getIsFavorite());
                 }
             }
 
diff --git a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
index e249acaccd..d17fbf84b3 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
@@ -138,4 +138,15 @@
          function="Inventory.GearDefault.Visible"
          parameter="multi_folder_view" />
     </menu_item_call>
+    <menu_item_separator/>
+    <menu_item_check
+     label="Inventory settings..."
+     name="inv_settings">
+      <menu_item_check.on_check
+       function="Floater.Visible"
+       parameter="inventory_settings" />
+      <menu_item_check.on_click
+       function="Floater.Toggle"
+       parameter="inventory_settings" />
+    </menu_item_check>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/menu_inventory_view_default.xml b/indra/newview/skins/default/xui/en/menu_inventory_view_default.xml
index 33cf01493d..97f53d3a17 100644
--- a/indra/newview/skins/default/xui/en/menu_inventory_view_default.xml
+++ b/indra/newview/skins/default/xui/en/menu_inventory_view_default.xml
@@ -100,15 +100,4 @@
          function="Inventory.GearDefault.Visible"
          parameter="single_folder_view" />
     </menu_item_check>
-    <menu_item_separator/>
-    <menu_item_check
-     label="Inventory settings..."
-     name="inv_settings">
-        <menu_item_check.on_check
-         function="Floater.Visible"
-         parameter="inventory_settings" />
-        <menu_item_check.on_click
-         function="Floater.Toggle"
-         parameter="inventory_settings" />
-    </menu_item_check>
 </toggleable_menu>
diff --git a/indra/newview/skins/default/xui/en/panel_places.xml b/indra/newview/skins/default/xui/en/panel_places.xml
index a3a2f7c47e..1bda5c019c 100644
--- a/indra/newview/skins/default/xui/en/panel_places.xml
+++ b/indra/newview/skins/default/xui/en/panel_places.xml
@@ -19,7 +19,7 @@ background_visible="true"
    value="VISITED" />
   <string
    name="favorites_tab_title"
-   value="FAVORITES" />
+   value="FAVORITES BAR" />
   <string
    name="tooltip_trash_items"
    value="Remove selected landmark or folder" />