diff options
| author | MaximB ProductEngine <mberezhnoy@productengine.com> | 2012-11-15 18:49:09 +0200 |
|---|---|---|
| committer | MaximB ProductEngine <mberezhnoy@productengine.com> | 2012-11-15 18:49:09 +0200 |
| commit | ed202aaad52bcf934e89fd4e51d7217d2990574e (patch) | |
| tree | 9074b6257550cb3b835b7fbd3b83e462e1348fa0 /indra/newview/llchicletbar.cpp | |
| parent | dbc37f6ca74dba6c6d5194e0397d5cfe6f570c1d (diff) | |
| parent | 7a088e9b2c8ffddbf5cd8dad72281a64a32d7c63 (diff) | |
merging into latest changes
Diffstat (limited to 'indra/newview/llchicletbar.cpp')
| -rw-r--r-- | indra/newview/llchicletbar.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llchicletbar.cpp b/indra/newview/llchicletbar.cpp index ad7890b47a..c66ae1cdd0 100644 --- a/indra/newview/llchicletbar.cpp +++ b/indra/newview/llchicletbar.cpp @@ -84,7 +84,7 @@ LLIMChiclet* LLChicletBar::createIMChiclet(const LLUUID& session_id) } //virtual -void LLChicletBar::sessionAdded(const LLUUID& session_id, const std::string& name, const LLUUID& other_participant_id) +void LLChicletBar::sessionAdded(const LLUUID& session_id, const std::string& name, const LLUUID& other_participant_id, BOOL has_offline_msg) { if (!getChicletPanel()) return; |