diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-11 09:19:20 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-11 09:19:20 +0000 |
| commit | 1b1dd127a4329cc7fed9d36608f4fc04ff056843 (patch) | |
| tree | 7c998ab7f4037aee8446817293bedafffd7958c2 /indra/newview/llsplitbutton.cpp | |
| parent | 6d738f25d9be0f4b576c8a55e9091ced589daf71 (diff) | |
| parent | a618a3913af506878adf59a2c5b5fb12e665e35b (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); } |