diff options
| author | Richard Linden <none@none> | 2011-10-15 18:14:23 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-10-15 18:14:23 -0700 |
| commit | 62d9db2f21b2a6fb579e8f7631a4e387cc5e5b29 (patch) | |
| tree | 54587047f6f27d3a1b58a23a1a532a4436e61f65 /indra/newview/llchatitemscontainerctrl.cpp | |
| parent | 94c137d5c970bc01e3a4dbe8de6a7104085e5ba6 (diff) | |
| parent | fc2bd1cce2e6c213fa682b9768d435a4e394a95e (diff) | |
Automated merge with http://hg.secondlife.com/viewer-development
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); } |