diff options
| author | Christian Goetze <cg@lindenlab.com> | 2007-10-10 00:01:43 +0000 |
|---|---|---|
| committer | Christian Goetze <cg@lindenlab.com> | 2007-10-10 00:01:43 +0000 |
| commit | 5ec8bbbe2244ea70d8aa74b5c572351632699425 (patch) | |
| tree | 12a4e92720c531105a21ef4f9f363b8572d72a3a /indra/newview/llfloatersnapshot.cpp | |
| parent | b3b62c3b9ef32c4dbcae51cd3ef582734d5717bb (diff) | |
svn merge -r71238:71367 svn+ssh://svn/svn/linden/branches/maint-ui-qa3
Diffstat (limited to 'indra/newview/llfloatersnapshot.cpp')
| -rw-r--r-- | indra/newview/llfloatersnapshot.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/indra/newview/llfloatersnapshot.cpp b/indra/newview/llfloatersnapshot.cpp index 96d53ffd1f..d0a21d2da6 100644 --- a/indra/newview/llfloatersnapshot.cpp +++ b/indra/newview/llfloatersnapshot.cpp @@ -1348,16 +1348,15 @@ void LLFloaterSnapshot::draw() childSetEnabled("send_btn", previewp->getSnapshotUpToDate()); } - //XUI:translate if (previewp->getSnapshotUpToDate()) { LLString bytes_string; gResMgr->getIntegerString(bytes_string, previewp->getDataSize()); - childSetTextArg("file_size_label", "[SIZE]", llformat("%s bytes", bytes_string.c_str())); + childSetTextArg("file_size_label", "[SIZE]", bytes_string); } else { - childSetTextArg("file_size_label", "[SIZE]", "unknown"); + childSetTextArg("file_size_label", "[SIZE]", childGetText("unknwon")); childSetColor("file_size_label", gColors.getColor( "LabelTextColor" )); } childSetEnabled("upload_btn", previewp->getSnapshotUpToDate()); @@ -1366,7 +1365,7 @@ void LLFloaterSnapshot::draw() } else { - childSetTextArg("file_size_label", "[SIZE]", "unknown"); + childSetTextArg("file_size_label", "[SIZE]", LLString("???")); childSetEnabled("upload_btn", FALSE); childSetEnabled("send_btn", FALSE); childSetEnabled("save_btn", FALSE); |