diff options
author | Steve Bennetts <steve@lindenlab.com> | 2009-12-02 12:52:13 -0800 |
---|---|---|
committer | Steve Bennetts <steve@lindenlab.com> | 2009-12-02 12:52:13 -0800 |
commit | 7bb862c8c1aa56fea6e533d5a257b3d39b428cac (patch) | |
tree | 6a66c190788be7c2b9797e682c5c09037a95729a /indra/newview/llpanelpick.cpp | |
parent | 6d3ca60f310e50b217a189086b652dca2e3e3854 (diff) | |
parent | d550339958c14f0d7fd222a8531df639eac49e63 (diff) |
Merge
Diffstat (limited to 'indra/newview/llpanelpick.cpp')
-rw-r--r-- | indra/newview/llpanelpick.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llpanelpick.cpp b/indra/newview/llpanelpick.cpp index da0c8d5020..541361324a 100644 --- a/indra/newview/llpanelpick.cpp +++ b/indra/newview/llpanelpick.cpp @@ -558,6 +558,11 @@ void LLPanelPickEdit::initTexturePickerMouseEvents() text_icon = getChild<LLIconCtrl>(XML_BTN_ON_TXTR); mSnapshotCtrl->setMouseEnterCallback(boost::bind(&LLPanelPickEdit::onTexturePickerMouseEnter, this, _1)); mSnapshotCtrl->setMouseLeaveCallback(boost::bind(&LLPanelPickEdit::onTexturePickerMouseLeave, this, _1)); + + // *WORKAROUND: Needed for EXT-1625: enabling save button each time when picker is opened, even if + // texture wasn't changed (see Steve's comment). + mSnapshotCtrl->setMouseDownCallback(boost::bind(&LLPanelPickEdit::enableSaveButton, this, true)); + text_icon->setVisible(FALSE); } |