diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-11-23 15:25:31 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-11-23 15:25:31 -0500 |
| commit | fc1860bcc6bab4b538692662db2da4be1def5af4 (patch) | |
| tree | 2452ea008050749c15be1dcd2b7f392ef499e796 /indra/newview/llfolderview.cpp | |
| parent | 0c3bd94da9ba2244613b6c1f1f0e4ce9723c46d3 (diff) | |
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
Diffstat (limited to 'indra/newview/llfolderview.cpp')
| -rw-r--r-- | indra/newview/llfolderview.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
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"); |