diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-10-17 17:45:22 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-10-17 17:45:22 -0700 |
| commit | 69cad25445a268c25c1f7a03fcd0f70d07a9596a (patch) | |
| tree | c39967979f61ee29dbfdb2bb745be04005e47e9b /indra/newview/llimview.cpp | |
| parent | 66d978497f8169d1a46a5ad8b74c2f72a61941be (diff) | |
| parent | d08a83337ceb28c56cd0d047a18d23a6d90d5713 (diff) | |
Pull from richard/viewer-experience-fui
Diffstat (limited to 'indra/newview/llimview.cpp')
| -rw-r--r-- | indra/newview/llimview.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 64d5152ebe..6e9baed5f2 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,12 @@ LLCallDialog::~LLCallDialog() BOOL LLCallDialog::postBuild() { - if (!LLDockableFloater::postBuild()) + if (!LLDockableFloater::postBuild() || !gToolBarView) return FALSE; + LLView *anchor_panel = gToolBarView->findChildView("speak"); + setDockControl(new LLDockControl(anchor_panel, this, getDockTongue(), LLDockControl::TOP)); + return TRUE; } |