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/lltexturectrl.cpp
View File

@@ -47,6 +47,7 @@
#include "llfoldervieweventlistener.h"
#include "llinventory.h"
#include "llinventoryfunctions.h"
#include "llinventorymodelbackgroundfetch.h"
#include "llinventoryview.h"
#include "lllineeditor.h"
#include "llui.h"
@@ -1344,7 +1345,7 @@ public:
{
// We need to find textures in all folders, so get the main
// background download going.
gInventory.startBackgroundFetch();
LLInventoryModelBackgroundFetch::instance().startBackgroundFetch();
gInventory.removeObserver(this);
delete this;
}
@@ -1368,9 +1369,9 @@ BOOL LLTextureCtrl::handleMouseDown(S32 x, S32 y, MASK mask)
showPicker(FALSE);
//grab textures first...
gInventory.startBackgroundFetch(gInventory.findCategoryUUIDForType(LLFolderType::FT_TEXTURE));
LLInventoryModelBackgroundFetch::instance().startBackgroundFetch(gInventory.findCategoryUUIDForType(LLFolderType::FT_TEXTURE));
//...then start full inventory fetch.
gInventory.startBackgroundFetch();
LLInventoryModelBackgroundFetch::instance().startBackgroundFetch();
}
return handled;
}