summaryrefslogtreecommitdiff
path: root/indra/newview/llchatitemscontainerctrl.cpp
diff options
context:
space:
mode:
authorsimon <none@none>2013-08-26 15:45:09 -0700
committersimon <none@none>2013-08-26 15:45:09 -0700
commit90d1c5b3676fe4e8ea8668b41fdf92613d5f102d (patch)
tree8d5afd9678fd44444bcc7b5d311b5cfb7abe5217 /indra/newview/llchatitemscontainerctrl.cpp
parentac2dc34ed0abbac8d5a8eb7f887037fe387c6a7a (diff)
parent27d637d0f14fdfff496256222dc1343d2d7ee9ae (diff)
Merge downstream code for CHUIStorm
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);
}