livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-fui

meow-7.2.2
Richard Nelson 2011-10-17 14:56:50 -07:00
parent 795695a2db 54bc99669c
commit da35e58c95
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/llimview.cpp
View File

@ -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;
}