diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-05-06 18:40:22 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-05-06 18:40:22 -0700 |
| commit | a26c7df637aea37aa5bf823f41f574d2ddd4ea70 (patch) | |
| tree | aa78044ebced7f959edd2ddc483867f75bfbfe81 /indra/newview/llpersonmodelcommon.cpp | |
| parent | 00275301fc6606c98f77f8fbb8e485b3788831a8 (diff) | |
| parent | 04587bdb9d5e1653d5b19a6ca51e547180994958 (diff) | |
Pull merge from viewer-fbc
Diffstat (limited to 'indra/newview/llpersonmodelcommon.cpp')
| -rw-r--r-- | indra/newview/llpersonmodelcommon.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llpersonmodelcommon.cpp b/indra/newview/llpersonmodelcommon.cpp index 9fefc17345..b3424cc451 100644 --- a/indra/newview/llpersonmodelcommon.cpp +++ b/indra/newview/llpersonmodelcommon.cpp @@ -151,8 +151,9 @@ void LLPersonModelCommon::setPassedFilter(bool passed, S32 filter_generation, st // LLPersonTabModel // -LLPersonTabModel::LLPersonTabModel(std::string display_name, LLFolderViewModelInterface& root_view_model) : -LLPersonModelCommon(display_name,root_view_model) +LLPersonTabModel::LLPersonTabModel(tab_type tab_type, std::string display_name, LLFolderViewModelInterface& root_view_model) : +LLPersonModelCommon(display_name,root_view_model), +mTabType(tab_type) { } |