diff options
| author | leyla_linden <none@none> | 2011-10-11 16:17:23 -0700 |
|---|---|---|
| committer | leyla_linden <none@none> | 2011-10-11 16:17:23 -0700 |
| commit | 9f0890fc3a6931562843e4597c009778424ee5bc (patch) | |
| tree | 72271f9187731f6d5ef7e57dac1fecb10e2d6370 /indra/newview/llchatitemscontainerctrl.cpp | |
| parent | c1a9ca33b27f4e741eeacf781a09156009167ad3 (diff) | |
EXP-1293 Nearby chat toasts no longer appear.
EXP-1316 Minimized Snapshot floater has a snapshot preview image attached below.
EXP-1318 Clicking on nearby chat toasts should bring up Nearby Chat history
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); } |