summaryrefslogtreecommitdiff
path: root/indra/newview/llconversationlog.h
diff options
context:
space:
mode:
authorMnikolenko ProductEngine <mnikolenko@productengine.com>2015-05-19 12:01:32 +0300
committerMnikolenko ProductEngine <mnikolenko@productengine.com>2015-05-19 12:01:32 +0300
commit193a298266c251a6be153cf37f5b2d2aa8513101 (patch)
tree324fd3d88706e182f09cebffc882333d937f5fcf /indra/newview/llconversationlog.h
parent76872412a26911e37bd13602ca6c29885dfd0f11 (diff)
MAINT-5201 FIXED 'Chat history' option in context menu does not works for multiperson chat.
Diffstat (limited to 'indra/newview/llconversationlog.h')
-rwxr-xr-xindra/newview/llconversationlog.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llconversationlog.h b/indra/newview/llconversationlog.h
index b38d472156..62f08144b9 100755
--- a/indra/newview/llconversationlog.h
+++ b/indra/newview/llconversationlog.h
@@ -153,6 +153,7 @@ public:
* file name is conversation.log
*/
std::string getFileName();
+ LLConversation* findConversation(const LLIMModel::LLIMSession* session);
private:
@@ -184,7 +185,7 @@ private:
void updateConversationName(const LLIMModel::LLIMSession* session, const std::string& name);
void updateOfflineIMs(const LLIMModel::LLIMSession* session, BOOL new_messages);
- LLConversation* findConversation(const LLIMModel::LLIMSession* session);
+
typedef std::vector<LLConversation> conversations_vec_t;
std::vector<LLConversation> mConversations;