diff options
| author | Richard Nelson <richard@lindenlab.com> | 2011-10-17 14:56:50 -0700 |
|---|---|---|
| committer | Richard Nelson <richard@lindenlab.com> | 2011-10-17 14:56:50 -0700 |
| commit | da35e58c951bffa19e47440bb51898cbc62e8bef (patch) | |
| tree | f6bf441b26bd055a09c1aa1a6563f6778d611cc3 /indra/newview | |
| parent | 795695a2db6de25a85fb319e79c44f8a4e1903b2 (diff) | |
| parent | 54bc99669ca684d4a6179415acf8e58591df63a2 (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-fui
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llimview.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 64d5152ebe..4df6eeaefc 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -60,6 +60,7 @@ #include "llnearbychat.h" #include "llspeakers.h" //for LLIMSpeakerMgr #include "lltextbox.h" +#include "lltoolbarview.h" #include "llviewercontrol.h" #include "llviewerparcelmgr.h" @@ -1676,9 +1677,14 @@ LLCallDialog::~LLCallDialog() BOOL LLCallDialog::postBuild() { - if (!LLDockableFloater::postBuild()) + if (!LLDockableFloater::postBuild() || !gToolBarView) return FALSE; + LLView *anchor_panel = gToolBarView->findChildView("speak"); + if (anchor_panel) + { + setDockControl(new LLDockControl(anchor_panel, this, getDockTongue(), LLDockControl::TOP)); + } return TRUE; } |