From fc1860bcc6bab4b538692662db2da4be1def5af4 Mon Sep 17 00:00:00 2001 From: Loren Shih Date: Mon, 23 Nov 2009 15:25:31 -0500 Subject: EXT-2705 : Create accordion panel to show COF contents Also made several infrastructure improvements that help inventory panels defer generating their folders/views until after inventory has been loaded up. This was pretty haphazard before. --HG-- branch : avatar-pipeline --- indra/newview/llfolderview.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'indra/newview/llfolderview.cpp') diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp index 955bc64e05..c9c4c76da4 100644 --- a/indra/newview/llfolderview.cpp +++ b/indra/newview/llfolderview.cpp @@ -2014,6 +2014,12 @@ static LLFastTimer::DeclareTimer FTM_INVENTORY("Inventory"); // Main idle routine void LLFolderView::doIdle() { + // Don't do anything until the inventory is loaded up. + if (!gInventory.isInventoryUsable()) + { + return; + } + LLFastTimer t2(FTM_INVENTORY); BOOL debug_filters = gSavedSettings.getBOOL("DebugInventoryFilters"); -- cgit v1.2.3 From 2b54c8a084a3f387d6f15b9d4f61d8cb68b434e0 Mon Sep 17 00:00:00 2001 From: Loren Shih Date: Mon, 23 Nov 2009 17:46:30 -0500 Subject: EXT-2763 : Right-click on inventory doesn't bring up context menu Also did some minor cleanup on header files. --HG-- branch : avatar-pipeline --- indra/newview/llfolderview.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'indra/newview/llfolderview.cpp') diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp index c9c4c76da4..3138b5b26f 100644 --- a/indra/newview/llfolderview.cpp +++ b/indra/newview/llfolderview.cpp @@ -44,6 +44,7 @@ #include "llkeyboard.h" #include "lllineeditor.h" #include "llmenugl.h" +#include "llpanel.h" #include "llpreview.h" #include "llscrollcontainer.h" // hack to allow scrolling #include "lltooldraganddrop.h" @@ -2014,12 +2015,13 @@ static LLFastTimer::DeclareTimer FTM_INVENTORY("Inventory"); // Main idle routine void LLFolderView::doIdle() { - // Don't do anything until the inventory is loaded up. + // Don't do anything until the inventory is usable and loaded up. + // Seraph: Change this to calling mParentPanel->isViewsInitialized if (!gInventory.isInventoryUsable()) { return; } - + LLFastTimer t2(FTM_INVENTORY); BOOL debug_filters = gSavedSettings.getBOOL("DebugInventoryFilters"); -- cgit v1.2.3 From e11d1c1d2b437b7b6d8ba0d0514f050b5d60b221 Mon Sep 17 00:00:00 2001 From: Loren Shih Date: Mon, 23 Nov 2009 18:10:37 -0500 Subject: EXT-2705 : Remove (dont' just grey out) right-click context menu options for Links that aren't necessary --HG-- branch : avatar-pipeline --- indra/newview/llfolderview.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'indra/newview/llfolderview.cpp') diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp index 3138b5b26f..ab49739d58 100644 --- a/indra/newview/llfolderview.cpp +++ b/indra/newview/llfolderview.cpp @@ -39,6 +39,7 @@ #include "llinventoryclipboard.h" // *TODO: remove this once hack below gone. #include "llinventoryfilter.h" #include "llinventoryfunctions.h" +#include "llinventorypanel.h" #include "llfoldertype.h" #include "llfloaterinventory.h"// hacked in for the bonus context menu items. #include "llkeyboard.h" @@ -2015,9 +2016,10 @@ static LLFastTimer::DeclareTimer FTM_INVENTORY("Inventory"); // Main idle routine void LLFolderView::doIdle() { - // Don't do anything until the inventory is usable and loaded up. - // Seraph: Change this to calling mParentPanel->isViewsInitialized - if (!gInventory.isInventoryUsable()) + // If this is associated with the user's inventory, don't do anything + // until that inventory is loaded up. + const LLInventoryPanel *inventory_panel = dynamic_cast(mParentPanel); + if (inventory_panel && !inventory_panel->getIsViewsInitialized()) { return; } -- cgit v1.2.3