diff options
| author | Richard Linden <none@none> | 2011-07-07 18:45:00 -0700 | 
|---|---|---|
| committer | Richard Linden <none@none> | 2011-07-07 18:45:00 -0700 | 
| commit | 0553d47045e65a0249ec7ee514078161a4bec97e (patch) | |
| tree | 7c7ca72b37c5a0d757241cb709c609ab57671f4c /indra | |
| parent | 88a90aabcb5bdede24bb451d443239e1e116c4ea (diff) | |
EXP-916 WIP Folder in Inbox indicates loading when all items are displayed in folder
background fetch always proceeds when fetching a specific folder
this allows us to flag folders that are received asynchronously as complete by
performing a background fetch when opening them
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llinventorymodelbackgroundfetch.cpp | 6 | 
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llinventorymodelbackgroundfetch.cpp b/indra/newview/llinventorymodelbackgroundfetch.cpp index afaf660cb7..91fdd67806 100644 --- a/indra/newview/llinventorymodelbackgroundfetch.cpp +++ b/indra/newview/llinventorymodelbackgroundfetch.cpp @@ -105,7 +105,7 @@ BOOL LLInventoryModelBackgroundFetch::backgroundFetchActive() const  void LLInventoryModelBackgroundFetch::start(const LLUUID& cat_id, BOOL recursive)  { -	if (!mAllFoldersFetched) +	if (!mAllFoldersFetched || cat_id.notNull())  	{  		LL_DEBUGS("InventoryFetch") << "Start fetching category: " << cat_id << ", recursive: " << recursive << LL_ENDL; @@ -211,7 +211,7 @@ void LLInventoryModelBackgroundFetch::backgroundFetch()  			// Double timeouts on failure.  			mMinTimeBetweenFetches = llmin(mMinTimeBetweenFetches * 2.f, 10.f);  			mMaxTimeBetweenFetches = llmin(mMaxTimeBetweenFetches * 2.f, 120.f); -			llinfos << "Inventory fetch times grown to (" << mMinTimeBetweenFetches << ", " << mMaxTimeBetweenFetches << ")" << llendl; +			lldebugs << "Inventory fetch times grown to (" << mMinTimeBetweenFetches << ", " << mMaxTimeBetweenFetches << ")" << llendl;  			// fetch is no longer considered "timely" although we will wait for full time-out.  			mTimelyFetchPending = FALSE;  		} @@ -280,7 +280,7 @@ void LLInventoryModelBackgroundFetch::backgroundFetch()  					// Shrink timeouts based on success.  					mMinTimeBetweenFetches = llmax(mMinTimeBetweenFetches * 0.8f, 0.3f);  					mMaxTimeBetweenFetches = llmax(mMaxTimeBetweenFetches * 0.8f, 10.f); -					//llinfos << "Inventory fetch times shrunk to (" << mMinTimeBetweenFetches << ", " << mMaxTimeBetweenFetches << ")" << llendl; +					lldebugs << "Inventory fetch times shrunk to (" << mMinTimeBetweenFetches << ", " << mMaxTimeBetweenFetches << ")" << llendl;  				}  				mTimelyFetchPending = FALSE;  | 
