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

13
indra/newview/llinventoryview.cpp
View File

@@ -59,6 +59,7 @@
#include "lliconctrl.h"
#include "llinventoryfunctions.h"
#include "llinventoryclipboard.h"
#include "llinventorymodelbackgroundfetch.h"
#include "lllineeditor.h"
#include "llmenugl.h"
#include "llpreviewanim.h"
@@ -619,7 +620,7 @@ LLInventoryView::~LLInventoryView( void )
void LLInventoryView::draw()
{
if (LLInventoryModel::isEverythingFetched())
if (LLInventoryModelBackgroundFetch::instance().isEverythingFetched())
{
LLLocale locale(LLLocale::USER_LOCALE);
std::ostringstream title;
@@ -729,7 +730,7 @@ void LLInventoryView::changed(U32 mask)
{
std::ostringstream title;
title << "Inventory";
if (LLInventoryModel::backgroundFetchActive())
if (LLInventoryModelBackgroundFetch::instance().backgroundFetchActive())
{
LLLocale locale(LLLocale::USER_LOCALE);
std::string item_count_string;
@@ -870,7 +871,7 @@ void LLInventoryView::toggleFindOptions()
addDependentFloater(mFinderHandle);
// start background fetch of folders
gInventory.startBackgroundFetch();
LLInventoryModelBackgroundFetch::instance().startBackgroundFetch();
mFloaterControls[std::string("Inventory.ShowFilters")]->setValue(TRUE);
}
@@ -946,7 +947,7 @@ void LLInventoryView::onSearchEdit(const std::string& search_string, void* user_
return;
}
gInventory.startBackgroundFetch();
LLInventoryModelBackgroundFetch::instance().startBackgroundFetch();
std::string filter_text = search_string;
std::string uppercase_search_string = filter_text;
@@ -1301,7 +1302,7 @@ void LLInventoryView::onFilterSelected(void* userdata, bool from_click)
if (filter->isActive())
{
// If our filter is active we may be the first thing requiring a fetch so we better start it here.
gInventory.startBackgroundFetch();
LLInventoryModelBackgroundFetch::instance().startBackgroundFetch();
}
self->setFilterTextFromFilter();
self->updateSortControls();
@@ -1907,7 +1908,7 @@ BOOL LLInventoryPanel::handleHover(S32 x, S32 y, MASK mask)
if(handled)
{
ECursorType cursor = getWindow()->getCursor();
if (LLInventoryModel::backgroundFetchActive() && cursor == UI_CURSOR_ARROW)
if (LLInventoryModelBackgroundFetch::instance().backgroundFetchActive() && cursor == UI_CURSOR_ARROW)
{
// replace arrow cursor with arrow and hourglass cursor
getWindow()->setCursor(UI_CURSOR_WORKING);