diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-09-06 16:35:02 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-09-06 16:35:02 -0700 |
| commit | 26ae00acf7da222b9478fedcfe5746191116991a (patch) | |
| tree | 0098bae20732b74218ae580273503cbe40c3aa48 /indra/newview/llchatitemscontainerctrl.cpp | |
| parent | ee5e689331ff6ba44cebaf9e9fb48f7bc3f590c4 (diff) | |
| parent | 62eb7ec0301c0313cedc2fcb63df8779b22a6d26 (diff) | |
Pull merge from richard/viewer-chui
Diffstat (limited to 'indra/newview/llchatitemscontainerctrl.cpp')
| -rw-r--r-- | indra/newview/llchatitemscontainerctrl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llchatitemscontainerctrl.cpp b/indra/newview/llchatitemscontainerctrl.cpp index e6340e0fa3..f1b5c42ef3 100644 --- a/indra/newview/llchatitemscontainerctrl.cpp +++ b/indra/newview/llchatitemscontainerctrl.cpp @@ -323,12 +323,12 @@ BOOL LLNearbyChatToastPanel::handleMouseUp (S32 x, S32 y, MASK mask) return TRUE; else { - LLNearbyChat::instance().showHistory(); + (LLFloaterReg::getTypedInstance<LLNearbyChat>("nearby_chat"))->showHistory(); return FALSE; } } - LLNearbyChat::instance().showHistory(); + (LLFloaterReg::getTypedInstance<LLNearbyChat>("nearby_chat"))->showHistory(); return LLPanel::handleMouseUp(x,y,mask); } |