diff options
| author | Graham Linden <graham@lindenlab.com> | 2013-08-26 14:31:53 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2013-08-26 14:31:53 -0700 |
| commit | 6e410c31c4f84247586312fa7763a2eb3a8db9da (patch) | |
| tree | 9540cc49b0c7aabd56869feaa9fbf48b34f12f2e /indra/newview/llchatitemscontainerctrl.cpp | |
| parent | 8675ed0491efee860ac1b2d1d5fe88d150768217 (diff) | |
| parent | 6e1138585bf745f73f0bb99ca62f77eeb273f1e4 (diff) | |
Merge the CHUIstorm 3.6.5
Diffstat (limited to 'indra/newview/llchatitemscontainerctrl.cpp')
| -rwxr-xr-x | indra/newview/llchatitemscontainerctrl.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llchatitemscontainerctrl.cpp b/indra/newview/llchatitemscontainerctrl.cpp index a1a9463d43..fd4f17b694 100755 --- a/indra/newview/llchatitemscontainerctrl.cpp +++ b/indra/newview/llchatitemscontainerctrl.cpp @@ -323,12 +323,11 @@ BOOL LLFloaterIMNearbyChatToastPanel::handleMouseUp (S32 x, S32 y, MASK mask) return TRUE; else { - (LLFloaterReg::getTypedInstance<LLFloaterIMNearbyChat>("nearby_chat"))->showHistory(); + LLFloaterReg::getTypedInstance<LLFloaterIMNearbyChat>("nearby_chat")->showHistory(); return FALSE; } } - - (LLFloaterReg::getTypedInstance<LLFloaterIMNearbyChat>("nearby_chat"))->showHistory(); + LLFloaterReg::getTypedInstance<LLFloaterIMNearbyChat>("nearby_chat")->showHistory(); return LLPanel::handleMouseUp(x,y,mask); } |