merge changes for STORM-1654

1 files changed, 7 insertions, 15 deletions

diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index 4de6976534..6e9baed5f2 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -46,7 +46,6 @@
 #include "llagentui.h"
 #include "llappviewer.h"
 #include "llavatariconctrl.h"
-#include "llbottomtray.h"
 #include "llcallingcard.h"
 #include "llchat.h"
 #include "llimfloater.h"
@@ -61,6 +60,7 @@
 #include "llnearbychat.h"
 #include "llspeakers.h" //for LLIMSpeakerMgr
 #include "lltextbox.h"
+#include "lltoolbarview.h"
 #include "llviewercontrol.h"
 #include "llviewerparcelmgr.h"
 
@@ -1675,23 +1675,13 @@ LLCallDialog::~LLCallDialog()
 	LLUI::removePopup(this);
 }
 
-void LLCallDialog::getAllowedRect(LLRect& rect)
-{
-	rect = gViewerWindow->getWorldViewRectScaled();
-}
-
 BOOL LLCallDialog::postBuild()
 {
-	if (!LLDockableFloater::postBuild())
+	if (!LLDockableFloater::postBuild() || !gToolBarView)
 		return FALSE;
 
-	// dock the dialog to the Speak Button, where other sys messages appear
-	LLView *anchor_panel = LLBottomTray::getInstance()->getChild<LLView>("speak_panel");
-
-	setDockControl(new LLDockControl(
-		anchor_panel, this,
-		getDockTongue(), LLDockControl::TOP,
-		boost::bind(&LLCallDialog::getAllowedRect, this, _1)));
+	LLView *anchor_panel = gToolBarView->findChildView("speak");
+	setDockControl(new LLDockControl(anchor_panel, this, getDockTongue(), LLDockControl::TOP));
 
 	return TRUE;
 }
@@ -2449,8 +2439,10 @@ void LLIMMgr::addSystemMessage(const LLUUID& session_id, const std::string& mess
 
 		LLChat chat(message);
 		chat.mSourceType = CHAT_SOURCE_SYSTEM;
+		
+		LLFloater* chat_bar = LLFloaterReg::getInstance("chat_bar");
+		LLNearbyChat* nearby_chat = chat_bar->findChild<LLNearbyChat>("nearby_chat");
 
-		LLNearbyChat* nearby_chat = LLFloaterReg::getTypedInstance<LLNearbyChat>("nearby_chat", LLSD());
 		if(nearby_chat)
 		{
 			nearby_chat->addMessage(chat);