summaryrefslogtreecommitdiff
path: root/indra/newview/llconversationmodel.h
diff options
context:
space:
mode:
authorRichard Linden <none@none>2013-12-09 16:15:13 -0800
committerRichard Linden <none@none>2013-12-09 16:15:13 -0800
commitdd0d7de67d12660b16720c47bdd4b238226d93e5 (patch)
treebcecede867014c6e054efb0caf3f8dd1c85f9e4b /indra/newview/llconversationmodel.h
parent50cba7940fbea7602f6b55df85fb9a2d2b47279b (diff)
parent813bc232e7175ba3e20a70f16427d12c7681a996 (diff)
Automated merge with http://bitbucket.org/lindenlab/viewer-lion
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