summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterimsession.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-11-11 16:40:22 -0500
committerOz Linden <oz@lindenlab.com>2013-11-11 16:40:22 -0500
commitd1b4c5bf734b6d30ba0bb5a3bda3a4494100cc6d (patch)
tree54a650e8e26dad00b3eaa3340b8bbf3083fc04b6 /indra/newview/llfloaterimsession.cpp
parent5ca4a4b8f34342ef510a4241bef4af7cd544d865 (diff)
parentebc9bcbf69f7a519677a6522979a6bf6cbb04bb8 (diff)
merge changes for 3.6.10-release
Diffstat (limited to 'indra/newview/llfloaterimsession.cpp')
-rwxr-xr-xindra/newview/llfloaterimsession.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloaterimsession.cpp b/indra/newview/llfloaterimsession.cpp
index aa933091a8..84921849d0 100755
--- a/indra/newview/llfloaterimsession.cpp
+++ b/indra/newview/llfloaterimsession.cpp
@@ -136,7 +136,7 @@ void LLFloaterIMSession::onTearOffClicked()
}
// virtual
-void LLFloaterIMSession::onClickCloseBtn()
+void LLFloaterIMSession::onClickCloseBtn(bool)
{
LLIMModel::LLIMSession* session = LLIMModel::instance().findIMSession(mSessionID);