diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-04-30 17:20:49 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-04-30 17:20:49 -0700 |
| commit | 8764e84041c48d0facd3a2860d90f78c88714f7c (patch) | |
| tree | 775bc74790ca0b65028608372a3557ced83b7a3c /indra/newview/llpersonmodelcommon.cpp | |
| parent | 336efe17d8f24a8445e93645f2cf18b68e18de2e (diff) | |
| parent | 9fdfc8dd5c52e515990f3ef4e552b9084fa66373 (diff) | |
Pull from viewer-fbc
Diffstat (limited to 'indra/newview/llpersonmodelcommon.cpp')
| -rw-r--r-- | indra/newview/llpersonmodelcommon.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/indra/newview/llpersonmodelcommon.cpp b/indra/newview/llpersonmodelcommon.cpp index 32ceef096d..3e9ca9c3b9 100644 --- a/indra/newview/llpersonmodelcommon.cpp +++ b/indra/newview/llpersonmodelcommon.cpp @@ -148,14 +148,21 @@ LLPersonModel* LLPersonTabModel::findParticipant(const LLUUID& person_id) // LLPersonModel // -LLPersonModel::LLPersonModel(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, LLFolderViewModelInterface& root_view_model) : +LLPersonModelCommon(display_name,root_view_model), +mAgentID(agent_id) { } LLPersonModel::LLPersonModel(LLFolderViewModelInterface& root_view_model) : -LLPersonModelCommon(root_view_model) +LLPersonModelCommon(root_view_model), +mAgentID(LLUUID(NULL)) +{ +} + +LLUUID LLPersonModel::getAgentID() { + return mAgentID; } // |