diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-11-23 17:46:30 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-11-23 17:46:30 -0500 |
| commit | 2b54c8a084a3f387d6f15b9d4f61d8cb68b434e0 (patch) | |
| tree | baea4cdf1fb4e1b1d10795225ce460ae1111acb0 /indra/newview/llfolderview.cpp | |
| parent | fc1860bcc6bab4b538692662db2da4be1def5af4 (diff) | |
EXT-2763 : Right-click on inventory doesn't bring up context menu
Also did some minor cleanup on header files.
--HG--
branch : avatar-pipeline
Diffstat (limited to 'indra/newview/llfolderview.cpp')
| -rw-r--r-- | indra/newview/llfolderview.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
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"); |