diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-08-27 10:37:02 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-08-27 10:37:02 -0400 |
| commit | a359d9d80c013b7c6cd594bb8d94b8950fdcdf55 (patch) | |
| tree | 7b687542962149ec448d436dbe62fe8ebac25d63 /indra/newview/llchatitemscontainerctrl.cpp | |
| parent | f46e07c14c11ffd26c0cf0794992d7c08d16fcd4 (diff) | |
| parent | 6e1138585bf745f73f0bb99ca62f77eeb273f1e4 (diff) | |
merge changes for 3.6.4-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); } |