Merge from default branch (first sync with dessie/viewer-public).

--HG--
branch : product-engine

1 files changed, 18 insertions, 3 deletions

diff --git a/indra/newview/llinventorymodelbackgroundfetch.h b/indra/newview/llinventorymodelbackgroundfetch.h
index 94606fae23..c1e37eda8f 100644
--- a/indra/newview/llinventorymodelbackgroundfetch.h
+++ b/indra/newview/llinventorymodelbackgroundfetch.h
@@ -68,13 +68,15 @@ class LLInventoryCollectFunctor;
 
 class LLInventoryModelBackgroundFetch : public LLSingleton<LLInventoryModelBackgroundFetch>
 {
+	friend class LLInventoryModelFetchDescendentsResponder;
+
 public:
 	LLInventoryModelBackgroundFetch();
 	~LLInventoryModelBackgroundFetch();
 
 	// Start and stop background breadth-first fetching of inventory contents.
 	// This gets triggered when performing a filter-search
-	void start(const LLUUID& cat_id = LLUUID::null);
+	void start(const LLUUID& cat_id = LLUUID::null, BOOL recursive = TRUE);
 	BOOL backgroundFetchActive();
 	bool isEverythingFetched();
 	void incrBulkFetch(S16 fetching);
@@ -98,9 +100,20 @@ public:
 	static void backgroundFetchCB(void*); // background fetch idle function
 	void backgroundFetch();
 	
+	struct FetchQueueInfo
+	{
+		FetchQueueInfo(const LLUUID& id, BOOL recursive) :
+			mCatUUID(id), mRecursive(recursive)
+		{
+		}
+		LLUUID mCatUUID;
+		BOOL mRecursive;
+	};
+protected:
+	bool fetchQueueContainsNoDescendentsOf(const LLUUID& cat_id) const;
 private:
- 	BOOL mInventoryFetchStarted;
-	BOOL mLibraryFetchStarted;
+ 	BOOL mRecursiveInventoryFetchStarted;
+	BOOL mRecursiveLibraryFetchStarted;
 	BOOL mAllFoldersFetched;
 
 	// completing the fetch once per session should be sufficient
@@ -113,6 +126,8 @@ private:
 	F32 mMinTimeBetweenFetches;
 	F32 mMaxTimeBetweenFetches;
 
+	typedef std::deque<FetchQueueInfo> fetch_queue_t;
+	fetch_queue_t mFetchQueue;
 };
 
 #endif // LL_LLINVENTORYMODELBACKGROUNDFETCH_H