summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterinventory.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2009-11-24 14:39:39 -0500
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2009-11-24 14:39:39 -0500
commitc812c616ea0ba6531b3fe7f75efc815081cd0c2e (patch)
tree2d966b5ba9fae58a3369055fadd6192b417c7f46 /indra/newview/llfloaterinventory.cpp
parentfc6cfc27bec61ac1f66c1304cc7b54f19157584e (diff)
parenta22bb00530bb779d8e5bb40b68e55767604d88dc (diff)
merge
--HG-- branch : avatar-pipeline
Diffstat (limited to 'indra/newview/llfloaterinventory.cpp')
-rw-r--r--indra/newview/llfloaterinventory.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/indra/newview/llfloaterinventory.cpp b/indra/newview/llfloaterinventory.cpp
index 92778510e7..db38fc0fb3 100644
--- a/indra/newview/llfloaterinventory.cpp
+++ b/indra/newview/llfloaterinventory.cpp
@@ -64,10 +64,7 @@ BOOL LLFloaterInventory::postBuild()
void LLFloaterInventory::draw()
{
- if (LLInventoryModel::isEverythingFetched())
- {
- updateTitle();
- }
+ updateTitle();
LLFloater::draw();
}
@@ -85,10 +82,14 @@ void LLFloaterInventory::updateTitle()
{
setTitle(getString("TitleFetching", string_args));
}
- else
+ else if (LLInventoryModel::isEverythingFetched())
{
setTitle(getString("TitleCompleted", string_args));
}
+ else
+ {
+ setTitle(getString("Title"));
+ }
}
void LLFloaterInventory::changed(U32 mask)