summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterinventory.cpp
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2009-11-24 12:10:10 -0500
committerLoren Shih <seraph@lindenlab.com>2009-11-24 12:10:10 -0500
commita22bb00530bb779d8e5bb40b68e55767604d88dc (patch)
tree520019b0c1e8c9cf475d19a60a0322a3c1caea6e /indra/newview/llfloaterinventory.cpp
parent0904cbe4846192c9897267c9a60175f84881f9ed (diff)
parent76be5ddc7022508e7d3fcb04165b4a6f64f1d58d (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)