diff options
author | Rider Linden <none@none> | 2015-04-15 11:54:18 -0700 |
---|---|---|
committer | Rider Linden <none@none> | 2015-04-15 11:54:18 -0700 |
commit | 109e2db131514de43a2d61da1cc4ee78dc89f858 (patch) | |
tree | 217ca4b42ee516dab39198661e2bc91514a5a8e5 /indra/newview/llavataractions.h | |
parent | 176d8cd268611e28c07a462df3027f4872456e5a (diff) | |
parent | 82ae214f6a367e17dd335e80e2444cf672108821 (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. |