diff options
| author | Eli Linden <eli@lindenlab.com> | 2010-03-05 16:21:45 -0800 |
|---|---|---|
| committer | Eli Linden <eli@lindenlab.com> | 2010-03-05 16:21:45 -0800 |
| commit | 64b5c53156ce3115652e094be25a3e165512ffca (patch) | |
| tree | ca0e1a0c54fb61285056f04ba5f8758312049fd3 /indra/newview/llsplitbutton.cpp | |
| parent | f92a3add5910103e910ad993c3b09a26cc0d2d59 (diff) | |
| parent | a3fa96ff0eeb3691f38e82ad4a245db8049dfddd (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); } |