diff options
| author | Richard Linden <none@none> | 2011-10-27 17:22:26 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-10-27 17:22:26 -0700 |
| commit | 6e8ffc247fe52668446b8fa1ed7f1547a755076f (patch) | |
| tree | 23b6fa5ce6bf6a32944faca54f9a18aca255fd75 /indra/newview/llchatitemscontainerctrl.cpp | |
| parent | 0ecc5c0878adf93e96b99e3db4c65cdb757b99fb (diff) | |
| parent | fcd1ccd21e3ea8f0944537347dd6c9d7972d50ce (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
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); } |