diff options
| author | Richard Linden <none@none> | 2010-03-05 14:46:00 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-03-05 14:46:00 -0800 |
| commit | 931ff555bdfe109e18a85a005bbe340f1951da40 (patch) | |
| tree | eca53eefddae66b310182d9ffa88490b96fb8536 /indra/newview/llsplitbutton.cpp | |
| parent | 18687a365245122fd74829fc0b735931d2d7d0e0 (diff) | |
| parent | 485711e179e0ccf6351feb02318f41bbb5593662 (diff) | |
merge
Diffstat (limited to 'indra/newview/llsplitbutton.cpp')
| -rw-r--r-- | indra/newview/llsplitbutton.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/indra/newview/llsplitbutton.cpp b/indra/newview/llsplitbutton.cpp index ffd9bc7624..e5323db466 100644 --- a/indra/newview/llsplitbutton.cpp +++ b/indra/newview/llsplitbutton.cpp @@ -165,7 +165,7 @@ void LLSplitButton::showButtons() // register ourselves as a "top" control // effectively putting us into a special draw layer - gFocusMgr.setTopCtrl(this); + gViewerWindow->addPopup(this); mItemsPanel->setFocus(TRUE); @@ -182,10 +182,7 @@ void LLSplitButton::hideButtons() mArrowBtn->setToggleState(FALSE); setUseBoundingRect(FALSE); - if(gFocusMgr.getTopCtrl() == this) - { - gFocusMgr.setTopCtrl(NULL); - } + gViewerWindow->removePopup(this); } |