summaryrefslogtreecommitdiff
path: root/indra/llui/llstatbar.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/llui/llstatbar.cpp')
-rw-r--r--indra/llui/llstatbar.cpp24
1 files changed, 12 insertions, 12 deletions
diff --git a/indra/llui/llstatbar.cpp b/indra/llui/llstatbar.cpp
index 5ea2eaabcd..adb1d51813 100644
--- a/indra/llui/llstatbar.cpp
+++ b/indra/llui/llstatbar.cpp
@@ -209,7 +209,7 @@ LLStatBar::LLStatBar(const Params& p)
setStat(p.stat);
}
-BOOL LLStatBar::handleHover(S32 x, S32 y, MASK mask)
+bool LLStatBar::handleHover(S32 x, S32 y, MASK mask)
{
switch(mStatType)
{
@@ -225,38 +225,38 @@ BOOL LLStatBar::handleHover(S32 x, S32 y, MASK mask)
default:
break;
}
- return TRUE;
+ return true;
}
-BOOL LLStatBar::handleMouseDown(S32 x, S32 y, MASK mask)
+bool LLStatBar::handleMouseDown(S32 x, S32 y, MASK mask)
{
- BOOL handled = LLView::handleMouseDown(x, y, mask);
+ bool handled = LLView::handleMouseDown(x, y, mask);
if (!handled)
{
if (mDisplayBar)
{
if (mDisplayHistory || mOrientation == HORIZONTAL)
{
- mDisplayBar = FALSE;
- mDisplayHistory = FALSE;
+ mDisplayBar = false;
+ mDisplayHistory = false;
}
else
{
- mDisplayHistory = TRUE;
+ mDisplayHistory = true;
}
}
else
{
- mDisplayBar = TRUE;
+ mDisplayBar = true;
if (mOrientation == HORIZONTAL)
{
- mDisplayHistory = TRUE;
+ mDisplayHistory = true;
}
}
LLView* parent = getParent();
- parent->reshape(parent->getRect().getWidth(), parent->getRect().getHeight(), FALSE);
+ parent->reshape(parent->getRect().getWidth(), parent->getRect().getHeight(), false);
}
- return TRUE;
+ return true;
}
template<typename T>
@@ -455,7 +455,7 @@ void LLStatBar::draw()
if (mDisplayHistory && mStat.valid)
{
- const S32 num_values = frame_recording.getNumRecordedPeriods() - 1;
+ const S32 num_values = static_cast<S32>(frame_recording.getNumRecordedPeriods()) - 1;
F32 min_value = 0.f,
max_value = 0.f;