summaryrefslogtreecommitdiff
path: root/indra/newview/llimview.cpp
diff options
context:
space:
mode:
authorRichard Nelson <richard@lindenlab.com>2011-10-17 14:56:44 -0700
committerRichard Nelson <richard@lindenlab.com>2011-10-17 14:56:44 -0700
commit54bc99669ca684d4a6179415acf8e58591df63a2 (patch)
tree6c47ce91e53256634ebfce250c9499ad1abdfce3 /indra/newview/llimview.cpp
parenta2e32429bbe222342c413eb06e2820f6292e251a (diff)
EXP-1384 FIX Voice requests not received in FUI viewer
Diffstat (limited to 'indra/newview/llimview.cpp')
-rw-r--r--indra/newview/llimview.cpp8
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;
}