summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelmaininventory.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2012-05-02 13:00:59 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2012-05-02 13:00:59 -0400
commit678864e4ed497de7d17e02fa79b93be54379a5b8 (patch)
treef946f0f5ffc116d2ba9c9ada237eb70594966ee6 /indra/newview/llpanelmaininventory.cpp
parent78fec489b53434a8ac8f9c0a8e72fd883067ce42 (diff)
parentd6569db3520f7e0ce2d93febb6f4e26b48c08a3d (diff)
merge viewer-release to drano
Diffstat (limited to 'indra/newview/llpanelmaininventory.cpp')
-rw-r--r--indra/newview/llpanelmaininventory.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index 374afb90be..c3c62920d3 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -567,7 +567,7 @@ void LLPanelMainInventory::updateItemcountText()
std::string text = "";
- if (LLInventoryModelBackgroundFetch::instance().backgroundFetchActive())
+ if (LLInventoryModelBackgroundFetch::instance().folderFetchActive())
{
text = getString("ItemcountFetching", string_args);
}