diff options
| author | Richard Linden <none@none> | 2012-02-09 17:14:57 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-02-09 17:14:57 -0800 |
| commit | ef81320c3198e8f63eddeeecd99799747acfe3f9 (patch) | |
| tree | 816ce0df7ef35c308414953798c92be5e4ee1771 /indra/newview/llinventorymodelbackgroundfetch.h | |
| parent | b72f1b59e8b673d9834bf18a466ec38e40650511 (diff) | |
| parent | aa345bd8f3844bdc2c5318d14b26343b91e6e573 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience/
Diffstat (limited to 'indra/newview/llinventorymodelbackgroundfetch.h')
| -rw-r--r-- | indra/newview/llinventorymodelbackgroundfetch.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llinventorymodelbackgroundfetch.h b/indra/newview/llinventorymodelbackgroundfetch.h index 0745407a8c..9dfedddd6d 100644 --- a/indra/newview/llinventorymodelbackgroundfetch.h +++ b/indra/newview/llinventorymodelbackgroundfetch.h @@ -48,7 +48,7 @@ public: // This gets triggered when performing a filter-search. void start(const LLUUID& cat_id = LLUUID::null, BOOL recursive = TRUE); - BOOL backgroundFetchActive() const; + BOOL folderFetchActive() const; bool isEverythingFetched() const; // completing the fetch once per session should be sufficient bool libraryFetchStarted() const; @@ -67,7 +67,6 @@ protected: void backgroundFetch(); static void backgroundFetchCB(void*); // background fetch idle function - void stopBackgroundFetch(); // stop fetch process void setAllFoldersFetched(); bool fetchQueueContainsNoDescendentsOf(const LLUUID& cat_id) const; @@ -77,6 +76,7 @@ private: BOOL mAllFoldersFetched; BOOL mBackgroundFetchActive; + bool mFolderFetchActive; S16 mFetchCount; BOOL mTimelyFetchPending; S32 mNumFetchRetries; |