diff options
author | Oz Linden <oz@lindenlab.com> | 2011-03-24 13:22:43 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-03-24 13:22:43 -0400 |
commit | fb1facf13a2f7413b42802bd7293d504eb4e4174 (patch) | |
tree | 9f0e5b980fa2d2e2d4bf97902610456fa279d6cd /indra/newview/llnearbychatbar.cpp | |
parent | a4f2c570dd42066f0e2738a0fd2de6c61c35b47b (diff) | |
parent | 1c375a8c880354432da2b218c321ed708497e161 (diff) |
syncing up to viewer-development
Diffstat (limited to 'indra/newview/llnearbychatbar.cpp')
-rw-r--r-- | indra/newview/llnearbychatbar.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/llnearbychatbar.cpp b/indra/newview/llnearbychatbar.cpp index 836ae9a0cf..162e465fef 100644 --- a/indra/newview/llnearbychatbar.cpp +++ b/indra/newview/llnearbychatbar.cpp @@ -157,6 +157,16 @@ BOOL LLGestureComboList::handleKeyHere(KEY key, MASK mask) return handled; } +void LLGestureComboList::draw() +{ + LLUICtrl::draw(); + + if(mButton->getToggleState()) + { + showList(); + } +} + void LLGestureComboList::showList() { LLRect rect = mList->getRect(); @@ -180,6 +190,7 @@ void LLGestureComboList::showList() // Show the list and push the button down mButton->setToggleState(TRUE); mList->setVisible(TRUE); + sendChildToFront(mList); LLUI::addPopup(mList); } |