diff options
| author | Paul ProductEngine <pguslisty@productengine.com> | 2012-09-06 23:16:22 +0300 |
|---|---|---|
| committer | Paul ProductEngine <pguslisty@productengine.com> | 2012-09-06 23:16:22 +0300 |
| commit | fd17cb601465b3433b647b895baede9b0fd822dd (patch) | |
| tree | bcaea772971c92443b454e24d5584bc4c39d0e6b /indra/newview/llconversationlog.h | |
| parent | 1a913365b594de81de56896a9fbdfd6d8c4f21e0 (diff) | |
CHUI-320 FIXED (Inconsistent name formatting in conversation log depending if user started conversation or not)
- On P2P session started, before creating entry of conversation log, requesting avatar name in form of Display Name (user.name)
Diffstat (limited to 'indra/newview/llconversationlog.h')
| -rw-r--r-- | indra/newview/llconversationlog.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llconversationlog.h b/indra/newview/llconversationlog.h index 9fd54c61c9..0d7f0080e5 100644 --- a/indra/newview/llconversationlog.h +++ b/indra/newview/llconversationlog.h @@ -62,6 +62,7 @@ public: void setIsVoice(bool is_voice); void setIsPast (bool is_past) { mIsConversationPast = is_past; } + void setConverstionName(std::string conv_name) { mConversationName = conv_name; } /* * Resets flag of unread offline message to false when im floater with this conversation is opened. @@ -156,6 +157,8 @@ 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); + typedef std::vector<LLConversation> conversations_vec_t; std::vector<LLConversation> mConversations; std::set<LLConversationLogObserver*> mObservers; |