merge changes for DRTVWR-417

1 files changed, 18 insertions, 1 deletions

diff --git a/indra/newview/llfriendcard.h b/indra/newview/llfriendcard.h
index 48a9f70079..ae3800e17b 100644
--- a/indra/newview/llfriendcard.h
+++ b/indra/newview/llfriendcard.h
@@ -45,6 +45,14 @@ class LLFriendCardsManager
 public:
 	typedef std::map<LLUUID, uuid_vec_t > folderid_buddies_map_t;
 
+    enum EManagerState
+    {
+        INIT = 1,
+        LOADING_FRIENDS_FOLDER,
+        LOADING_ALL_FOLDER,
+        MANAGER_READY
+    };
+
 	// LLFriendObserver implementation
 	void changed(U32 mask)
 	{
@@ -71,7 +79,14 @@ public:
 	/**
 	 *	Checks is the specified category is a Friend folder or any its subfolder
 	 */
-	bool isAnyFriendCategory(const LLUUID& catID) const;
+    bool isAnyFriendCategory(const LLUUID& catID) const;
+
+    /**
+    *	Indicates that all calling card related folders are created or loaded
+    */
+    bool isManagerReady() const { return mState == MANAGER_READY; }
+
+    EManagerState getManagerState() const { return mState; }
 
 	/**
 	 *	Checks whether "Friends" and "Friends/All" folders exist in "Calling Cards" category
@@ -144,6 +159,8 @@ private:
 	typedef std::set<LLUUID> avatar_uuid_set_t;
 
 	avatar_uuid_set_t mBuddyIDSet;
+    EManagerState mState;
+
 };
 
 #endif // LL_LLFRIENDCARD_H