diff options
| author | Richard Linden <none@none> | 2013-08-26 18:17:26 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-08-26 18:17:26 -0700 |
| commit | 1f3f660cf4de95fa7e6cbe4015630640aecd22dd (patch) | |
| tree | 1b64dea44cca08731b0c33b15b90e929c83831d0 /indra/llui/llstatbar.cpp | |
| parent | cb8c94cc888c432a22af98f9d28d448d66a77a52 (diff) | |
| parent | 8535b87544cc2e71896716a4cd1c3c2445ff4af0 (diff) | |
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/llui/llstatbar.cpp')
| -rwxr-xr-x | indra/llui/llstatbar.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llstatbar.cpp b/indra/llui/llstatbar.cpp index 3cd2e53001..725a835f7f 100755 --- a/indra/llui/llstatbar.cpp +++ b/indra/llui/llstatbar.cpp @@ -325,7 +325,7 @@ void LLStatBar::draw() { const LLTrace::TraceType<LLTrace::CountAccumulator>& count_stat = *mCountFloatp; - unit_label = mUnitLabel.empty() ? (std::string(count_stat.getUnitLabel()) + "/s") : mUnitLabel; + unit_label = std::string(count_stat.getUnitLabel()) + "/s"; current = last_frame_recording.getPerSec(count_stat); min = frame_recording.getPeriodMinPerSec(count_stat, num_frames); max = frame_recording.getPeriodMaxPerSec(count_stat, num_frames); |