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/llstatusbar.cpp | |
| parent | b3b62c3b9ef32c4dbcae51cd3ef582734d5717bb (diff) | |
svn merge -r71238:71367 svn+ssh://svn/svn/linden/branches/maint-ui-qa3
Diffstat (limited to 'indra/newview/llstatusbar.cpp')
| -rw-r--r-- | indra/newview/llstatusbar.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp index 9b7d31acb4..9bbb25fd2b 100644 --- a/indra/newview/llstatusbar.cpp +++ b/indra/newview/llstatusbar.cpp @@ -252,6 +252,8 @@ void LLStatusBar::refresh() mSGBandwidth->setThreshold(1, bwtotal); mSGBandwidth->setThreshold(2, bwtotal); + // *TODO: Localize / translate time + // Get current UTC time, adjusted for the user's clock // being off. U32 utc_time; @@ -285,7 +287,7 @@ void LLStatusBar::refresh() t << std::setfill(' ') << std::setw(2) << hour << ":" << std::setfill('0') << std::setw(2) << min << " " << am_pm << " " << tz; - mTextTime->setText(t.str().c_str()); + mTextTime->setText(t.str()); // Year starts at 1900, set the tooltip to have the date std::ostringstream date; @@ -462,13 +464,13 @@ void LLStatusBar::refresh() pos_y -= pos_y % 2; } - if (parcel && parcel->getName()) + if (parcel && !parcel->getName().empty()) { location_name = region->getName() + llformat(" %d, %d, %d (%s) - %s", pos_x, pos_y, pos_z, region->getSimAccessString(), - parcel->getName()); + parcel->getName().c_str()); } else { @@ -537,10 +539,8 @@ void LLStatusBar::setBalance(S32 balance) void LLStatusBar::setHealth(S32 health) { - char buffer[MAX_STRING]; /* Flawfinder: ignore */ - snprintf(buffer, MAX_STRING, "%d%%", health); /* Flawfinder: ignore */ //llinfos << "Setting health to: " << buffer << llendl; - mTextHealth->setText(buffer); + mTextHealth->setText(llformat("%d%%", health)); if( mHealth > health ) { |