diff options
| author | dolphin <dolphin@lindenlab.com> | 2013-10-22 13:40:52 -0700 |
|---|---|---|
| committer | dolphin <dolphin@lindenlab.com> | 2013-10-22 13:40:52 -0700 |
| commit | 93b1111507f5e5c812b6a9e8e47bdf7db67931a0 (patch) | |
| tree | 214b852c8451409d5d355437ddad48199bef976a /indra/newview/llfloaterimnearbychat.h | |
| parent | 03cc47698489929b66fbceb139e4c95d13392b9d (diff) | |
| parent | 0d0a8d841cab3fbb569a7382b78b0b4fb485eefb (diff) | |
Merge with viewer-bear
Diffstat (limited to 'indra/newview/llfloaterimnearbychat.h')
| -rwxr-xr-x | indra/newview/llfloaterimnearbychat.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloaterimnearbychat.h b/indra/newview/llfloaterimnearbychat.h index 05b48cccb0..f0daacd6a9 100755 --- a/indra/newview/llfloaterimnearbychat.h +++ b/indra/newview/llfloaterimnearbychat.h @@ -95,7 +95,7 @@ protected: void onChatFontChange(LLFontGL* fontp); /*virtual*/ void onTearOffClicked(); - /*virtual*/ void onClickCloseBtn(); + /*virtual*/ void onClickCloseBtn(bool app_qutting = false); static LLWString stripChannelNumber(const LLWString &mesg, S32* channel); EChatType processChatTypeTriggers(EChatType type, std::string &str); |