#5368 adding simple logging and clean up

2 files changed, 4 insertions, 9 deletions

diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index e4db686776..88367540e9 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -588,6 +588,7 @@ set(viewer_SOURCE_FILES
     llslurl.cpp
     llsnapshotlivepreview.cpp
     llspatialpartition.cpp
+    llstatslistener.cpp
     llspeakers.cpp
     llspeakingindicatormanager.cpp
     llsplitbutton.cpp
@@ -739,7 +740,6 @@ set(viewer_SOURCE_FILES
     llwebprofile.cpp
     llwind.cpp
     llwindowlistener.cpp
-    llstatslistener.cpp
     llwlhandlers.cpp
     llworld.cpp
     llworldmap.cpp
@@ -1260,6 +1260,7 @@ set(viewer_HEADER_FILES
     llsnapshotlivepreview.h
     llsnapshotmodel.h
     llspatialpartition.h
+    llstatslistener.h
     llspeakers.h
     llspeakingindicatormanager.h
     llsplitbutton.h
@@ -1413,7 +1414,6 @@ set(viewer_HEADER_FILES
     llwebprofile.h
     llwind.h
     llwindowlistener.h
-    llstatslistener.h
     llwlhandlers.h
     llworld.h
     llworldmap.h
diff --git a/indra/newview/llinventorymodelbackgroundfetch.cpp b/indra/newview/llinventorymodelbackgroundfetch.cpp
index f68eb7f4a5..b02b2e2eb9 100644
--- a/indra/newview/llinventorymodelbackgroundfetch.cpp
+++ b/indra/newview/llinventorymodelbackgroundfetch.cpp
@@ -207,6 +207,7 @@ void LLInventoryModelBackgroundFetch::markFetchStarted()
     {
         mFetchStartTimer.reset();
     }
+    mBackgroundFetchActive = true;
 }
 
 LLInventoryModelBackgroundFetch::~LLInventoryModelBackgroundFetch()
@@ -300,7 +301,6 @@ void LLInventoryModelBackgroundFetch::start(const LLUUID& id, bool recursive)
         LL_DEBUGS(LOG_INV) << "Start fetching category: " << id << ", recursive: " << recursive << LL_ENDL;
 
         markFetchStarted();
-        mBackgroundFetchActive = true;
         mFolderFetchActive = true;
         EFetchType recursion_type = recursive ? FT_RECURSIVE : FT_DEFAULT;
         if (id.isNull())
@@ -388,7 +388,6 @@ void LLInventoryModelBackgroundFetch::scheduleFolderFetch(const LLUUID& cat_id,
     if (mFetchFolderQueue.empty() || mFetchFolderQueue.front().mUUID != cat_id)
     {
         markFetchStarted();
-        mBackgroundFetchActive = true;
         mFolderFetchActive = true;
 
         if (forced)
@@ -416,7 +415,6 @@ void LLInventoryModelBackgroundFetch::scheduleItemFetch(const LLUUID& item_id, b
     if (mFetchItemQueue.empty() || mFetchItemQueue.front().mUUID != item_id)
     {
         markFetchStarted();
-        mBackgroundFetchActive = true;
         if (forced)
         {
             // check if already requested
@@ -461,7 +459,6 @@ void LLInventoryModelBackgroundFetch::fetchFolderAndLinks(const LLUUID& cat_id,
 
     // start idle loop to track completion
     markFetchStarted();
-    mBackgroundFetchActive = true;
     mFolderFetchActive = true;
     gIdleCallbacks.addFunction(&LLInventoryModelBackgroundFetch::backgroundFetchCB, nullptr);
 }
@@ -504,7 +501,6 @@ void LLInventoryModelBackgroundFetch::fetchCOF(nullary_func_t callback)
 
     // start idle loop to track completion
     markFetchStarted();
-    mBackgroundFetchActive = true;
     mFolderFetchActive = true;
     gIdleCallbacks.addFunction(&LLInventoryModelBackgroundFetch::backgroundFetchCB, nullptr);
 }
@@ -512,7 +508,6 @@ void LLInventoryModelBackgroundFetch::fetchCOF(nullary_func_t callback)
 void LLInventoryModelBackgroundFetch::findLostItems()
 {
     markFetchStarted();
-    mBackgroundFetchActive = true;
     mFolderFetchActive = true;
     mFetchFolderQueue.emplace_back(LLUUID::null, FT_RECURSIVE);
     gIdleCallbacks.addFunction(&LLInventoryModelBackgroundFetch::backgroundFetchCB, nullptr);
@@ -542,7 +537,7 @@ void LLInventoryModelBackgroundFetch::setAllFoldersFetched()
     // For now only informs about initial fetch being done
     mFoldersFetchedSignal();
 
-    LL_INFOS(LOG_INV) << "Inventory background fetch completed" << LL_ENDL;
+    LL_INFOS(LOG_INV) << "Inventory background fetch completed after: " << mFetchStartTimer.getElapsedTimeF32() << LL_ENDL;
 }
 
 boost::signals2::connection LLInventoryModelBackgroundFetch::setFetchCompletionCallback(folders_fetched_callback_t cb)