diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-05-10 18:29:00 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-05-10 18:29:00 -0700 |
| commit | cc87c6785258cb04f11cb79ce2e9899d33f11e03 (patch) | |
| tree | fcc057e96fbd8af5a5664bf4036d79ce4c6e92e0 /indra/newview/llpersonmodelcommon.cpp | |
| parent | 7c4bfc8f55ebc581ddac0c2394b07b24d240d1a6 (diff) | |
| parent | fb27eae15502cbd2a13cde018ae67f961320d0ba (diff) | |
Pull merge from viewer-fbc
Diffstat (limited to 'indra/newview/llpersonmodelcommon.cpp')
| -rw-r--r-- | indra/newview/llpersonmodelcommon.cpp | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/indra/newview/llpersonmodelcommon.cpp b/indra/newview/llpersonmodelcommon.cpp index b3424cc451..e48eddf05a 100644 --- a/indra/newview/llpersonmodelcommon.cpp +++ b/indra/newview/llpersonmodelcommon.cpp @@ -39,14 +39,24 @@ LLPersonModelCommon::LLPersonModelCommon(std::string display_name, LLFolderViewModelInterface& root_view_model) : LLFolderViewModelItemCommon(root_view_model), + mLabelSuffix(""), mID(LLUUID().generateNewID()) { renameItem(display_name); } +LLPersonModelCommon::LLPersonModelCommon(std::string display_name, std::string suffix, LLFolderViewModelInterface& root_view_model) : +LLFolderViewModelItemCommon(root_view_model), + mID(LLUUID().generateNewID()) +{ + mLabelSuffix = suffix; + renameItem(display_name); +} + LLPersonModelCommon::LLPersonModelCommon(LLFolderViewModelInterface& root_view_model) : LLFolderViewModelItemCommon(root_view_model), mName(""), + mLabelSuffix(""), mSearchableName(""), mPrevPassedAllFilters(false), mID(LLUUID().generateNewID()) @@ -212,8 +222,8 @@ LLPersonModel* LLPersonTabModel::findParticipant(const LLUUID& person_id) // LLPersonModel // -LLPersonModel::LLPersonModel(const LLUUID& agent_id, const std::string display_name, LLFolderViewModelInterface& root_view_model) : -LLPersonModelCommon(display_name,root_view_model), +LLPersonModel::LLPersonModel(const LLUUID& agent_id, const std::string display_name, const std::string suffix, LLFolderViewModelInterface& root_view_model) : +LLPersonModelCommon(display_name, suffix, root_view_model), mAgentID(agent_id) { } |