Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Inv fetch migrated from LLInventoryModel to LLInventoryModelBackgroundFetch singleton.

Browse Source
This commit is contained in:
Shyotl
2012-01-20 19:09:44 -06:00
parent b338506229
commit 4c201a9b83
16 changed files with 740 additions and 586 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
indra/newview/llfolderview.cpp
View File

@@ -49,6 +49,7 @@
#include "llinventoryclipboard.h" // *TODO: remove this once hack below gone.
#include "llinventoryview.h"// hacked in for the bonus context menu items.
#include "llinventoryfunctions.h"
#include "llinventorymodelbackgroundfetch.h"
#include "llkeyboard.h"
#include "lllineeditor.h"
#include "llmenugl.h"
@@ -1308,7 +1309,7 @@ void LLFolderViewFolder::filter( LLInventoryFilter& filter)
// when applying a filter, matching folders get their contents downloaded first
if (filter.isNotDefault() && getFiltered(filter.getMinRequiredGeneration()) && (mListener && !gInventory.isCategoryComplete(mListener->getUUID())))
{
gInventory.startBackgroundFetch(mListener->getUUID());
LLInventoryModelBackgroundFetch::instance().startBackgroundFetch(mListener->getUUID());
}
// now query children
@@ -3319,7 +3320,7 @@ void LLFolderView::draw()
}
else
{
if (gInventory.backgroundFetchActive() || mCompletedFilterGeneration < mFilter.getMinRequiredGeneration())
if (LLInventoryModelBackgroundFetch::instance().backgroundFetchActive() || mCompletedFilterGeneration < mFilter.getMinRequiredGeneration())
{
mStatusText = std::string("Searching..."); // *TODO:translate
sFont->renderUTF8(mStatusText, 0, 2, 1, sSearchStatusColor, LLFontGL::LEFT, LLFontGL::TOP, LLFontGL::NORMAL, LLFontGL::NO_SHADOW, S32_MAX, S32_MAX, NULL, FALSE );
@@ -5123,7 +5124,7 @@ std::string LLInventoryFilter::getFilterText()
filtered_by_all_types = FALSE;
}
if (!gInventory.backgroundFetchActive() && filtered_by_type && !filtered_by_all_types)
if (!LLInventoryModelBackgroundFetch::instance().backgroundFetchActive() && filtered_by_type && !filtered_by_all_types)
{
mFilterText += " - ";
if (num_filter_types < 5)