diff options
| author | James Cook <james@lindenlab.com> | 2009-11-16 21:49:46 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-11-16 21:49:46 -0800 |
| commit | 2852fce2de898f5999bfaaf939637f06f5b2112d (patch) | |
| tree | 0bf1e86941c1776e37680ca1231a7b5b975f2523 /indra/llui/llbutton.h | |
| parent | 18980efe16e19ab0562267e10ec55bed55b581fb (diff) | |
| parent | a97941369ddde6a548e91576655d5f52942d085e (diff) | |
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0
Diffstat (limited to 'indra/llui/llbutton.h')
| -rw-r--r-- | indra/llui/llbutton.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/llbutton.h b/indra/llui/llbutton.h index 08f289092f..3c1b57c4be 100644 --- a/indra/llui/llbutton.h +++ b/indra/llui/llbutton.h @@ -238,7 +238,7 @@ public: 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 @@ private: BOOL mNeedsHighlight; BOOL mCommitOnReturn; BOOL mFadeWhenDisabled; - BOOL mForcePressedState; + bool mForcePressedState; LLFrameTimer mFlashingTimer; }; |