diff options
| author | James Cook <james@lindenlab.com> | 2009-10-03 23:40:28 +0000 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-10-03 23:40:28 +0000 |
| commit | ada0f4fa221f2c7070fb02a2b7ff903bdde11c45 (patch) | |
| tree | 0ede83511c304110138c01d16da2fff55162ef31 /indra/llui/llbutton.cpp | |
| parent | b1a280841e1823a19658923a8eefeb67d1d70735 (diff) | |
Merge inspectors UI project, gooey-4, into viewer-2 trunk. Added new tooltips to 3D avatars, 2D avatar names, and 3D objects. Refactors tooltips and text boxes, line editors, and text editors. Breaks LLExpandableTextBox, but a fix is coming.
Resolved conflicts in lltexteditor.cpp, llchatitemscontainerctrl.cpp, llchatmsgbox.cpp, llfloaterbuycurrency.cpp, llnearbychat.cpp, floater_buy_currency.xml, and ru/strings.xml
Merging revisions 134925-135157 of svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-4 into C:\source\viewer-2.0.0-3, respecting ancestry
Diffstat (limited to 'indra/llui/llbutton.cpp')
| -rw-r--r-- | indra/llui/llbutton.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/llui/llbutton.cpp b/indra/llui/llbutton.cpp index b9613b502c..219c2ee254 100644 --- a/indra/llui/llbutton.cpp +++ b/indra/llui/llbutton.cpp @@ -145,7 +145,8 @@ LLButton::LLButton(const LLButton::Params& p) mRightHPad(p.pad_right), mHoverGlowStrength(p.hover_glow_amount), mCommitOnReturn(p.commit_on_return), - mFadeWhenDisabled(FALSE) + mFadeWhenDisabled(FALSE), + mForcePressedState(FALSE) { static LLUICachedControl<S32> llbutton_orig_h_pad ("UIButtonOrigHPad", 0); static Params default_params(LLUICtrlFactory::getDefaultParams<LLButton>()); @@ -536,7 +537,8 @@ void LLButton::draw() bool enabled = isInEnabledChain(); bool pressed = pressed_by_keyboard - || (hasMouseCapture() && pointInView(local_mouse_x, local_mouse_y)); + || (hasMouseCapture() && pointInView(local_mouse_x, local_mouse_y)) + || mForcePressedState; bool selected = getToggleState(); bool use_glow_effect = FALSE; |