Skip to content
Snippets Groups Projects
Commit d5efbfcd authored by James Cook's avatar James Cook
Browse files

Convert mForcePressedState to bool from BOOL

parent a1cb7deb
No related branches found
No related tags found
No related merge requests found
......@@ -146,7 +146,7 @@ LLButton::LLButton(const LLButton::Params& p)
mHoverGlowStrength(p.hover_glow_amount),
mCommitOnReturn(p.commit_on_return),
mFadeWhenDisabled(FALSE),
mForcePressedState(FALSE),
mForcePressedState(false),
mLastDrawCharsCount(0)
{
static LLUICachedControl<S32> llbutton_orig_h_pad ("UIButtonOrigHPad", 0);
......
......@@ -238,7 +238,7 @@ class LLButton
static void setDockableFloaterToggle(LLUICtrl* ctrl, const LLSD& sdname);
static void showHelp(LLUICtrl* ctrl, const LLSD& sdname);
void setForcePressedState(BOOL b) { mForcePressedState = b; }
void setForcePressedState(bool b) { mForcePressedState = b; }
protected:
LLPointer<LLUIImage> getImageUnselected() const { return mImageUnselected; }
......@@ -315,7 +315,7 @@ class LLButton
BOOL mNeedsHighlight;
BOOL mCommitOnReturn;
BOOL mFadeWhenDisabled;
BOOL mForcePressedState;
bool mForcePressedState;
LLFrameTimer mFlashingTimer;
};
......
......@@ -133,11 +133,11 @@ void LLMenuButton::draw()
if (mMenuVisibleLastFrame)
{
setForcePressedState(TRUE);
setForcePressedState(true);
}
LLButton::draw();
setForcePressedState(FALSE);
setForcePressedState(false);
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment