diff options
author | Callum Prentice <callum@lindenlab.com> | 2014-05-28 09:06:58 -0700 |
---|---|---|
committer | Callum Prentice <callum@lindenlab.com> | 2014-05-28 09:06:58 -0700 |
commit | 038f250caea80e21192372019dca8fdcf269c0d9 (patch) | |
tree | 2d5d0ec8fcc86886c27ffc58166183ce5f96be58 /indra/newview/llconversationmodel.h | |
parent | fbe10b8ee0537c71f2119142f4e0da1bd69d1a53 (diff) | |
parent | 644ca6a0f8a7759119814f88df93b8e838321a12 (diff) |
Merge with head of viewer-release
Diffstat (limited to 'indra/newview/llconversationmodel.h')
-rw-r--r-- | indra/newview/llconversationmodel.h | 3 |
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 |