summaryrefslogtreecommitdiff
path: root/indra/newview/llconversationmodel.h
diff options
context:
space:
mode:
authorStinson Linden <stinson@lindenlab.com>2014-05-19 22:19:55 +0100
committerStinson Linden <stinson@lindenlab.com>2014-05-19 22:19:55 +0100
commitbabd89b77050ab49166f2fbd6d460884070140d9 (patch)
treedd3039e009f3e0f7ca2de578f4599e79ca15a1dc /indra/newview/llconversationmodel.h
parent08e83a341e76de8fa4d8c4a974edbe3e0bd1c128 (diff)
parent644ca6a0f8a7759119814f88df93b8e838321a12 (diff)
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.
Diffstat (limited to 'indra/newview/llconversationmodel.h')
-rw-r--r--indra/newview/llconversationmodel.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llconversationmodel.h b/indra/newview/llconversationmodel.h
index d8cdcdfc97..dc74506c53 100644
--- a/indra/newview/llconversationmodel.h
+++ b/indra/newview/llconversationmodel.h
@@ -291,6 +291,9 @@ class LLConversationViewModel
{
public:
typedef LLFolderViewModel<LLConversationSort, LLConversationItem, LLConversationItem, LLConversationFilter> base_t;
+ LLConversationViewModel()
+ : base_t(new LLConversationSort(), new LLConversationFilter())
+ {}
void sort(LLFolderViewFolder* folder);
bool contentsReady() { return true; } // *TODO : we need to check that participants names are available somewhat