diff options
| author | leyla_linden <none@none> | 2011-10-11 16:18:24 -0700 |
|---|---|---|
| committer | leyla_linden <none@none> | 2011-10-11 16:18:24 -0700 |
| commit | 7a13cde7604977b32a9f3a027a0ce5b64d52ad9c (patch) | |
| tree | 5976f4729e2b082b9dac4fe3683d94f7509c13e8 /indra/newview/llchatitemscontainerctrl.cpp | |
| parent | ca9ea840951bcfeaf46f07c9ee0974408c21792a (diff) | |
| parent | 9f0890fc3a6931562843e4597c009778424ee5bc (diff) | |
Merge
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); } |