diff options
| author | Paul ProductEngine <pguslisty@productengine.com> | 2012-09-18 16:41:37 +0300 |
|---|---|---|
| committer | Paul ProductEngine <pguslisty@productengine.com> | 2012-09-18 16:41:37 +0300 |
| commit | a3607a8d8c86b2c25bfa0abda1b0fc9b00f2c099 (patch) | |
| tree | 720875694e3a71d3e30f1b851c74b9fdd45dffe6 /indra/newview/llconversationlog.h | |
| parent | 97cce3d34f21fea8eb6c259e04480c269e8ada28 (diff) | |
CHUI-339 FIXED (2 entries shown in conversation log for ad hoc conference for user that starts the conference)
Diffstat (limited to 'indra/newview/llconversationlog.h')
| -rw-r--r-- | indra/newview/llconversationlog.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llconversationlog.h b/indra/newview/llconversationlog.h index a458e975bb..6fff7d6772 100644 --- a/indra/newview/llconversationlog.h +++ b/indra/newview/llconversationlog.h @@ -162,13 +162,13 @@ private: bool saveToFile(const std::string& filename); bool loadFromFile(const std::string& filename); - void onAvatarNameCache(const LLUUID& participant_id, const LLAvatarName& av_name, LLIMModel::LLIMSession* session); + void onAvatarNameCache(const LLUUID& participant_id, const LLAvatarName& av_name, const LLIMModel::LLIMSession* session); - void createConversation(const LLUUID& session_id); + void createConversation(const LLIMModel::LLIMSession* session); void updateConversationTimestamp(LLConversation* conversation); - void updateConversationName(const LLUUID& session_id, const std::string& name); + void updateConversationName(const LLIMModel::LLIMSession* session, const std::string& name); - LLConversation* findConversation(const LLUUID& session_id); + LLConversation* findConversation(const LLIMModel::LLIMSession* session); typedef std::vector<LLConversation> conversations_vec_t; std::vector<LLConversation> mConversations; |