6 files changed, 4 insertions, 26 deletions
diff --git a/indra/newview/llconversationmodel.h b/indra/newview/llconversationmodel.h
index e2eaff12e5..3b70b9a568 100644
--- a/indra/newview/llconversationmodel.h
+++ b/indra/newview/llconversationmodel.h
@@ -80,8 +80,6 @@ public:
 	virtual LLFontGL::StyleFlags getLabelStyle() const { return LLFontGL::NORMAL; }
 	virtual std::string getLabelSuffix() const { return LLStringUtil::null; }
     virtual bool isFavorite() const { return false; }
-    virtual bool hasFavorites() const { return false; }
-    virtual void setHasFavorites(bool val) {}
 	virtual BOOL isItemRenameable() const { return TRUE; }
 	virtual BOOL renameItem(const std::string& new_name) { mName = new_name; mNeedsRefresh = true; return TRUE; }
 	virtual BOOL isItemMovable( void ) const { return FALSE; }
diff --git a/indra/newview/llfolderviewmodelinventory.cpp b/indra/newview/llfolderviewmodelinventory.cpp
index bc5a07abf2..6bf539fc48 100644
--- a/indra/newview/llfolderviewmodelinventory.cpp
+++ b/indra/newview/llfolderviewmodelinventory.cpp
@@ -111,8 +111,10 @@ void LLFolderViewModelInventory::sort( LLFolderViewFolder* folder )
         LLFolderViewItem* child_itemp = *it;
         has_favorites |= child_itemp->isFavorite();
     }
-    folder->setHasFavorites(has_favorites);
-    sort_modelp->setHasFavorites(has_favorites);
+    if (has_favorites)
+    {
+        folder->updateHasFavorites(true);
+    }
 	base_t::sort(folder);
 }
 
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 560a2f265a..5620523f24 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -2434,16 +2434,6 @@ bool LLFolderBridge::isFavorite() const
     return false;
 }
 
-bool LLFolderBridge::hasFavorites() const
-{
-    return mHasFavorites;
-}
-
-void LLFolderBridge::setHasFavorites(bool val)
-{
-    mHasFavorites = val;
-}
-
 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 8bb4e188e6..39cd393fdd 100644
--- a/indra/newview/llinventorybridge.h
+++ b/indra/newview/llinventorybridge.h
@@ -258,8 +258,6 @@ public:
 	LLViewerInventoryItem* getItem() const;
     virtual const LLUUID& getThumbnailUUID() const;
     virtual bool isFavorite() const;
-    virtual bool hasFavorites() const { return false; }
-    virtual void setHasFavorites(bool val) {}
 
 protected:
 	BOOL confirmRemoveItem(const LLSD& notification, const LLSD& response);
@@ -281,7 +279,6 @@ public:
 		mCallingCards(FALSE),
 		mWearables(FALSE),
 		mIsLoading(false),
-        mHasFavorites(false),
 		mShowDescendantsCount(false)
 	{}
 		
@@ -308,8 +305,6 @@ public:
 	virtual LLFontGL::StyleFlags getLabelStyle() const;
     virtual const LLUUID& getThumbnailUUID() const;
     virtual bool isFavorite() const;
-    virtual bool hasFavorites() const;
-    virtual void setHasFavorites(bool val);
 
 	void setShowDescendantsCount(bool show_count) {mShowDescendantsCount = show_count;}
 
@@ -397,7 +392,6 @@ protected:
 	bool							mWearables;
 	bool							mIsLoading;
 	bool							mShowDescendantsCount;
-    bool							mHasFavorites;
 	LLTimer							mTimeSinceRequestStart;
     std::string                     mMessage;
 	LLRootHandle<LLFolderBridge> mHandle;
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index 4aace2f96e..6a5cd59acb 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -624,7 +624,6 @@ void LLInventoryPanel::itemChanged(const LLUUID& item_id, U32 mask, const LLInve
     {
         if (view_item)
         {
-            // TODO:: move to idle
             LLFolderViewFolder* parent = view_item->getParentFolder();
             if (parent)
             {
@@ -663,7 +662,6 @@ void LLInventoryPanel::itemChanged(const LLUUID& item_id, U32 mask, const LLInve
 			updateFolderLabel(model_item->getParentUUID());
             if (model_item->getIsFavorite())
             {
-                // TODO:: move to idle
                 LLFolderViewFolder* new_parent = (LLFolderViewFolder*)getItemByID(model_item->getParentUUID());
                 if (new_parent)
                 {
@@ -720,7 +718,6 @@ void LLInventoryPanel::itemChanged(const LLUUID& item_id, U32 mask, const LLInve
 
                     if (view_item->isFavorite())
                     {
-                        // TODO:: move to idle
                         old_parent->updateHasFavorites(false); // favorite was removed
                         new_parent->updateHasFavorites(true); // favorite was added
                     }
@@ -747,7 +744,6 @@ void LLInventoryPanel::itemChanged(const LLUUID& item_id, U32 mask, const LLInve
 				}
                 if (view_item->isFavorite())
                 {
-                    // TODO:: move to idle
                     parent->updateHasFavorites(false); // favorite was removed
                 }
 			}
diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp
index e38e2622c9..3bd93b10ad 100644
--- a/indra/newview/llpanelobjectinventory.cpp
+++ b/indra/newview/llpanelobjectinventory.cpp
@@ -130,8 +130,6 @@ public:
 	virtual BOOL isItemRenameable() const;
 	virtual BOOL renameItem(const std::string& new_name);
     virtual bool isFavorite() const { return false; }
-    virtual bool hasFavorites() const { return false; }
-    virtual void setHasFavorites(bool val) {};
 	virtual BOOL isItemMovable() const;
 	virtual BOOL isItemRemovable() const;
 	virtual BOOL removeItem();