diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2012-01-05 16:30:15 -0800 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2012-01-05 16:30:15 -0800 |
| commit | af32a74b77ffc2110de821e0159de8eb5aa0f454 (patch) | |
| tree | 9c4561032da6e9d258628d33709c8018c356a140 /indra/newview/llfloateroutbox.cpp | |
| parent | b0db21a8ae93283acc99491b9b14c2e8f1a35395 (diff) | |
EXP-1757 FIX -- Merchant Outbox shows as empty when first opening/initializing even when populated
* Updated merchant outbox floater to not wait for initialization to complete before displaying outbox inventory contents.
Diffstat (limited to 'indra/newview/llfloateroutbox.cpp')
| -rw-r--r-- | indra/newview/llfloateroutbox.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/indra/newview/llfloateroutbox.cpp b/indra/newview/llfloateroutbox.cpp index 8ccebb36dc..6ecf715588 100644 --- a/indra/newview/llfloateroutbox.cpp +++ b/indra/newview/llfloateroutbox.cpp @@ -280,6 +280,14 @@ void LLFloaterOutbox::updateFolderCount() mOutboxItemCount = item_count; + if (!mImportBusy) + { + updateFolderCountStatus(); + } +} + +void LLFloaterOutbox::updateFolderCountStatus() +{ if (mOutboxInventoryPanel) { switch (mOutboxItemCount) @@ -304,10 +312,7 @@ void LLFloaterOutbox::updateFolderCount() void LLFloaterOutbox::updateView() { - if (!mImportBusy) - { - updateFolderCount(); - } + updateFolderCount(); if (mOutboxItemCount > 0) { |