From 1f413c33eacfefe1283c978499bbc1c778747b81 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Sat, 29 Jun 2013 11:05:34 +0200 Subject: [PATCH] FS communication UI: Build fix in llchatitemscontainerctrl.cpp --- indra/newview/llchatitemscontainerctrl.cpp | 29 +++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/indra/newview/llchatitemscontainerctrl.cpp b/indra/newview/llchatitemscontainerctrl.cpp index 6ed1939429..bbd9be5961 100644 --- a/indra/newview/llchatitemscontainerctrl.cpp +++ b/indra/newview/llchatitemscontainerctrl.cpp @@ -35,7 +35,10 @@ #include "llfloaterreg.h" #include "lllocalcliprect.h" #include "lltrans.h" -#include "llfloaterimnearbychat.h" +// [FS communication UI] +//#include "llfloaterimnearbychat.h" +#include "fsfloaternearbychat.h" +// [FS communication UI] #include "llviewercontrol.h" #include "llagentdata.h" @@ -342,12 +345,32 @@ BOOL LLFloaterIMNearbyChatToastPanel::handleMouseUp (S32 x, S32 y, MASK mask) return TRUE; else { - (LLFloaterReg::getTypedInstance("nearby_chat"))->showHistory(); + // [FS communication UI] + //(LLFloaterReg::getTypedInstance("nearby_chat"))->showHistory(); + FSFloaterNearbyChat::getInstance()->setVisible(TRUE); + + // If nearby chat history is docked, we also need + // to open the container floater (FIRE-6265) + if (!gSavedSettings.getBOOL("ChatHistoryTornOff")) + { + LLFloaterReg::showInstance("fs_im_container"); + } + // [FS communication UI] return FALSE; } } - (LLFloaterReg::getTypedInstance("nearby_chat"))->showHistory(); + // [FS communication UI] + //(LLFloaterReg::getTypedInstance("nearby_chat"))->showHistory(); + FSFloaterNearbyChat::getInstance()->setVisible(TRUE); + + // If nearby chat history is docked, we also need + // to open the container floater (FIRE-6265) + if (!gSavedSettings.getBOOL("ChatHistoryTornOff")) + { + LLFloaterReg::showInstance("fs_im_container"); + } + // [FS communication UI] return LLPanel::handleMouseUp(x,y,mask); }