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/llsyswellwindow.cpp | |
| parent | dbc37f6ca74dba6c6d5194e0397d5cfe6f570c1d (diff) | |
| parent | 7a088e9b2c8ffddbf5cd8dad72281a64a32d7c63 (diff) | |
merging into latest changes
Diffstat (limited to 'indra/newview/llsyswellwindow.cpp')
| -rw-r--r-- | indra/newview/llsyswellwindow.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llsyswellwindow.cpp b/indra/newview/llsyswellwindow.cpp index 18e0d9d0d2..1b8bdf3b46 100644 --- a/indra/newview/llsyswellwindow.cpp +++ b/indra/newview/llsyswellwindow.cpp @@ -617,7 +617,7 @@ BOOL LLIMWellWindow::postBuild() //virtual void LLIMWellWindow::sessionAdded(const LLUUID& session_id, - const std::string& name, const LLUUID& other_participant_id) + const std::string& name, const LLUUID& other_participant_id, BOOL has_offline_msg) { LLIMModel::LLIMSession* session = LLIMModel::getInstance()->findIMSession(session_id); if (!session) return; |