From 54bc99669ca684d4a6179415acf8e58591df63a2 Mon Sep 17 00:00:00 2001 From: Richard Nelson Date: Mon, 17 Oct 2011 14:56:44 -0700 Subject: EXP-1384 FIX Voice requests not received in FUI viewer --- indra/newview/llimview.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'indra') 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; } -- cgit v1.2.3 From c05d86039ca1642fd6fd7398fbbfe7f49d9e8539 Mon Sep 17 00:00:00 2001 From: Richard Nelson Date: Mon, 17 Oct 2011 15:08:44 -0700 Subject: EXP-1384 FIX Voice requests not received in FUI viewer fixed case where toolbar button was not in use --- indra/newview/llimview.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'indra') diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 4df6eeaefc..6e9baed5f2 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -1681,10 +1681,8 @@ BOOL LLCallDialog::postBuild() return FALSE; LLView *anchor_panel = gToolBarView->findChildView("speak"); - if (anchor_panel) - { - setDockControl(new LLDockControl(anchor_panel, this, getDockTongue(), LLDockControl::TOP)); - } + setDockControl(new LLDockControl(anchor_panel, this, getDockTongue(), LLDockControl::TOP)); + return TRUE; } -- cgit v1.2.3