diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2011-10-17 15:21:34 -0700 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2011-10-17 15:21:34 -0700 |
| commit | 395a29717026221255d8bed57098afa52c49bff9 (patch) | |
| tree | 2678c231f9614fd9be45a12f909062c0b66fad24 /indra | |
| parent | dfd1d822ff28046bb24fa41dbd11a636d393a40a (diff) | |
| parent | c05d86039ca1642fd6fd7398fbbfe7f49d9e8539 (diff) | |
merge
Diffstat (limited to 'indra')
| -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; } |