diff options
| author | Richard Linden <none@none> | 2013-03-22 10:57:19 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-03-22 10:57:19 -0700 |
| commit | f1539b727946956826c7c5fb0188b7770cfbdc24 (patch) | |
| tree | 8f6371c2d631f5ad26bd3a9c852fa92edee3b090 /indra/llui/lltoolbar.cpp | |
| parent | 5525257b8580df3dbc9860370564e19c9d6cbbaa (diff) | |
| parent | 21b7de56ad6c1efd81ad4406aba1428633b9356e (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting
Diffstat (limited to 'indra/llui/lltoolbar.cpp')
| -rw-r--r-- | indra/llui/lltoolbar.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/indra/llui/lltoolbar.cpp b/indra/llui/lltoolbar.cpp index 2297285c39..13aa21b505 100644 --- a/indra/llui/lltoolbar.cpp +++ b/indra/llui/lltoolbar.cpp @@ -117,7 +117,8 @@ LLToolBar::LLToolBar(const LLToolBar::Params& p) mButtonEnterSignal(NULL), mButtonLeaveSignal(NULL), mButtonRemoveSignal(NULL), - mDragAndDropTarget(false) + mDragAndDropTarget(false), + mCaretIcon(NULL) { mButtonParams[LLToolBarEnums::BTNTYPE_ICONS_WITH_TEXT] = p.button_icon_and_text; mButtonParams[LLToolBarEnums::BTNTYPE_ICONS_ONLY] = p.button_icon; @@ -830,7 +831,12 @@ void LLToolBar::draw() LLUI::translate((F32)getRect().mLeft, (F32)getRect().mBottom); // Position the caret - LLIconCtrl* caret = getChild<LLIconCtrl>("caret"); + if (!mCaretIcon) + { + mCaretIcon = getChild<LLIconCtrl>("caret"); + } + + LLIconCtrl* caret = mCaretIcon; caret->setVisible(FALSE); if (mDragAndDropTarget && !mButtonCommands.empty()) { |