diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-10-11 16:20:45 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-10-11 16:20:45 -0700 |
| commit | 48f7514fbd0db8266b8c70263d9f16f6f4201320 (patch) | |
| tree | c1b3d1f5cb351be2e34a3728ed19105e057b49df /indra/newview/llchatitemscontainerctrl.cpp | |
| parent | dacfe7b2bdc845640f18db33992924033494e470 (diff) | |
| parent | 7a13cde7604977b32a9f3a027a0ce5b64d52ad9c (diff) | |
Pull from richard/viewer-experience-fui
Diffstat (limited to 'indra/newview/llchatitemscontainerctrl.cpp')
| -rw-r--r-- | indra/newview/llchatitemscontainerctrl.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llchatitemscontainerctrl.cpp b/indra/newview/llchatitemscontainerctrl.cpp index 8584885bc9..9a84280f25 100644 --- a/indra/newview/llchatitemscontainerctrl.cpp +++ b/indra/newview/llchatitemscontainerctrl.cpp @@ -35,6 +35,7 @@ #include "llfloaterreg.h" #include "lllocalcliprect.h" #include "lltrans.h" +#include "llnearbychatbar.h" #include "llviewercontrol.h" #include "llagentdata.h" @@ -315,12 +316,12 @@ BOOL LLNearbyChatToastPanel::handleMouseUp (S32 x, S32 y, MASK mask) return TRUE; else { - LLFloaterReg::showInstance("nearby_chat",LLSD()); + LLNearbyChatBar::getInstance()->showHistory(); return FALSE; } } - LLFloaterReg::showInstance("nearby_chat",LLSD()); + LLNearbyChatBar::getInstance()->showHistory(); return LLPanel::handleMouseUp(x,y,mask); } |