diff options
| author | James Cook <james@lindenlab.com> | 2009-11-17 10:03:49 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-11-17 10:03:49 -0800 |
| commit | 6253e2611d3ecf4ff5c778d0e53f34aed06f35da (patch) | |
| tree | cd96eca8461fa5c0eac08b20c03e3c0039ff6bf6 /indra/llui/llbutton.h | |
| parent | a2041387b1c39328aaf0d5037ca039a971a6d79c (diff) | |
| parent | ddee62b833480afdf730737bea6c97437daca74e (diff) | |
merge
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; }; |
