summaryrefslogtreecommitdiff
path: root/indra/newview/llchatitemscontainerctrl.cpp
diff options
context:
space:
mode:
authorGilbert Gonzales <gilbert@lindenlab.com>2013-08-28 18:30:38 -0700
committerGilbert Gonzales <gilbert@lindenlab.com>2013-08-28 18:30:38 -0700
commitc767354a204a7618e7ceb3650a0516dcde519a8d (patch)
tree6b258169b67cc4986814ba0f5901760038c539d7 /indra/newview/llchatitemscontainerctrl.cpp
parent6c45b3677ee06cd58056447a4b7b45fa78df8b74 (diff)
parent6e1138585bf745f73f0bb99ca62f77eeb273f1e4 (diff)
merging viewer release
Diffstat (limited to 'indra/newview/llchatitemscontainerctrl.cpp')
-rwxr-xr-xindra/newview/llchatitemscontainerctrl.cpp5
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);
}