diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-06 11:15:09 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-06 11:15:09 +0000 |
| commit | 809a280a51bc8645de7a02c2a3dbe32bc230b93c (patch) | |
| tree | 2a4d6dbe1fb8d78e77f5f7ce118a5f662788a453 /indra/newview/llexpandabletextbox.cpp | |
| parent | 1889d02569a58d08b6c452e609819a1961bf64e8 (diff) | |
| parent | 93051dc23cb3252af327a9b113abc45de154ff4e (diff) | |
viewer2 merge.
Diffstat (limited to 'indra/newview/llexpandabletextbox.cpp')
| -rw-r--r-- | indra/newview/llexpandabletextbox.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/indra/newview/llexpandabletextbox.cpp b/indra/newview/llexpandabletextbox.cpp index 3818ee6f78..362010d65a 100644 --- a/indra/newview/llexpandabletextbox.cpp +++ b/indra/newview/llexpandabletextbox.cpp @@ -35,6 +35,7 @@ #include "llscrollcontainer.h" #include "llwindow.h" +#include "llviewerwindow.h" static LLDefaultChildRegistry::Register<LLExpandableTextBox> t1("expandable_text"); @@ -382,7 +383,7 @@ void LLExpandableTextBox::expandTextBox() setFocus(TRUE); // this lets us receive top_lost event(needed to collapse text box) // it also draws text box above all other ui elements - gFocusMgr.setTopCtrl(this); + gViewerWindow->addPopup(this); mExpanded = true; } @@ -401,10 +402,7 @@ void LLExpandableTextBox::collapseTextBox() updateTextBoxRect(); - if(gFocusMgr.getTopCtrl() == this) - { - gFocusMgr.setTopCtrl(NULL); - } + gViewerWindow->removePopup(this); } void LLExpandableTextBox::onFocusLost() |