diff options
author | Baker Linden <baker@lindenlab.com> | 2013-09-30 17:27:25 -0700 |
---|---|---|
committer | Baker Linden <baker@lindenlab.com> | 2013-09-30 17:27:25 -0700 |
commit | ce526d40638fcc78724913621ee5c12f792f1859 (patch) | |
tree | 735e03596926582d70d1609754d4e91fd6f49b77 /indra/newview/llchatitemscontainerctrl.cpp | |
parent | 34f561db55868185f0a946009f41f4f212366484 (diff) | |
parent | ad777b46d0fe5d790e43efb1771e9f64f3ad3dfb (diff) |
Merge with voorhees (viewer-release)
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); } |