summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorypanel.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2012-07-03 17:05:28 -0700
committerRichard Linden <none@none>2012-07-03 17:05:28 -0700
commita8defa513c3b2b83f476a1de115fd0332566b483 (patch)
treec08141e3dd3379808aecdafa0f72635b7ed9f113 /indra/newview/llinventorypanel.cpp
parent7fb39240d0b0b849e5459c075ce973210d3c5c44 (diff)
CHUI-101 WIP Make LLFolderview general purpose
removed viewer dependencies from folderview code
Diffstat (limited to 'indra/newview/llinventorypanel.cpp')
-rw-r--r--indra/newview/llinventorypanel.cpp11
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp
index c1ffe89184..fed9893158 100644
--- a/indra/newview/llinventorypanel.cpp
+++ b/indra/newview/llinventorypanel.cpp
@@ -258,6 +258,8 @@ void LLInventoryPanel::initFromParams(const LLInventoryPanel::Params& params)
LLInventoryPanel::~LLInventoryPanel()
{
+ gIdleCallbacks.deleteFunction(idle, this);
+
U32 sort_order = getFolderViewModel()->getSorter().getSortOrder();
if (mSortOrderSetting != INHERIT_SORT_ORDER)
{
@@ -566,12 +568,21 @@ void LLInventoryPanel::onIdle(void *userdata)
}
}
+void LLInventoryPanel::idle(void* user_data)
+{
+ LLInventoryPanel* panel = (LLInventoryPanel*)user_data;
+ panel->mFolderRoot->doIdle();
+}
+
+
void LLInventoryPanel::initializeViews()
{
if (!gInventory.isInventoryUsable()) return;
rebuildViewsFor(gInventory.getRootFolderID());
+ gIdleCallbacks.addFunction(idle, this);
+
mViewsInitialized = true;
openStartFolderOrMyInventory();