diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2015-04-13 17:19:27 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2015-04-13 17:19:27 -0400 |
| commit | 32940ee90b6dae898f83cf99516f18f106246ace (patch) | |
| tree | 1fca162d8adc5b7aed5a0193627d6caf773f09fd /indra/newview/llavataractions.h | |
| parent | cddfcda1677c4a5d25d2adc54eb4c3aef0953ee1 (diff) | |
| parent | a647b8f1cbab13f07ea889c80df28414bc906129 (diff) | |
merge
Diffstat (limited to 'indra/newview/llavataractions.h')
| -rwxr-xr-x | indra/newview/llavataractions.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llavataractions.h b/indra/newview/llavataractions.h index 85813f2152..bd0ac24e93 100755 --- a/indra/newview/llavataractions.h +++ b/indra/newview/llavataractions.h @@ -221,7 +221,7 @@ public: * @param avatar_names - a vector of given avatar names from which resulting string is built * @param residents_string - the resulting string */ - static void buildResidentsString(std::vector<LLAvatarName> avatar_names, std::string& residents_string); + static void buildResidentsString(std::vector<LLAvatarName> avatar_names, std::string& residents_string, bool complete_name = false); /** * Builds a string of residents' display names separated by "words_separator" string. |