viewer#1300 'Star' favorites in inventory #2

2 files changed, 59 insertions, 0 deletions

diff --git a/indra/llui/llfolderviewitem.cpp b/indra/llui/llfolderviewitem.cpp
index 84146e5829..be703a1e9a 100644
--- a/indra/llui/llfolderviewitem.cpp
+++ b/indra/llui/llfolderviewitem.cpp
@@ -1783,6 +1783,64 @@ BOOL LLFolderViewFolder::isMovable()
 	return TRUE;
 }
 
+void LLFolderViewFolder::updateHasFavorites(bool new_childs_value)
+{
+    if (mHasFavorites != new_childs_value)
+    {
+        if (new_childs_value)
+        {
+            mHasFavorites = new_childs_value;
+            // propagate up to root
+            LLFolderViewFolder* parent = getParentFolder();
+            while (parent && !parent->hasFavorites())
+            {
+                parent->setHasFavorites(true);
+                parent = parent->getParentFolder();
+            }
+        }
+        else
+        {
+            LLFolderViewFolder* parent = this;
+            while (parent)
+            {
+                bool has_favorites = false;
+                for (items_t::iterator iter = parent->mItems.begin();
+                    iter != parent->mItems.end();)
+                {
+                    items_t::iterator iit = iter++;
+                    if ((*iit)->isFavorite())
+                    {
+                        has_favorites = true;
+                        break;
+                    }
+                }
+
+                for (folders_t::iterator iter = parent->mFolders.begin();
+                    iter != parent->mFolders.end() && !has_favorites;)
+                {
+                    folders_t::iterator fit = iter++;
+                    if ((*fit)->isFavorite() || (*fit)->hasFavorites())
+                    {
+                        has_favorites = true;
+                        break;
+                    }
+                }
+
+                if (!has_favorites)
+                {
+                    parent->mHasFavorites = false;
+                    parent->setHasFavorites(false);
+                }
+                else
+                {
+                    break;
+                }
+                parent = parent->getParentFolder();
+            }
+        }
+    }
+}
+
 
 BOOL LLFolderViewFolder::isRemovable()
 {
diff --git a/indra/llui/llfolderviewitem.h b/indra/llui/llfolderviewitem.h
index eba3cf4f83..5905516023 100644
--- a/indra/llui/llfolderviewitem.h
+++ b/indra/llui/llfolderviewitem.h
@@ -401,6 +401,7 @@ public:
     bool isFavorite() const { return mIsFavorite; }
     bool hasFavorites() const { return mHasFavorites; }
     void setHasFavorites(bool val) { mHasFavorites = val; }
+    void updateHasFavorites(bool new_childs_value);
 
 	// destroys this folder, and all children
 	virtual void destroyView();