diff options
author | MaximB ProductEngine <mberezhnoy@productengine.com> | 2012-10-10 20:15:10 +0300 |
---|---|---|
committer | MaximB ProductEngine <mberezhnoy@productengine.com> | 2012-10-10 20:15:10 +0300 |
commit | ecd263485a5205f3444041a58e2bb060a3075e44 (patch) | |
tree | fcb8cb1de167ba7777ae9ca8ef54233c6bd7663e /indra/newview/llavataractions.h | |
parent | 8b4423d428a0a209711eb18cc003d9ca4970e17a (diff) | |
parent | ad371c2cfd9d39a4d615cb709b8f85fada0154c6 (diff) |
merge changes
Diffstat (limited to 'indra/newview/llavataractions.h')
-rw-r--r-- | 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 e7cef587c2..6e1198cd09 100644 --- a/indra/newview/llavataractions.h +++ b/indra/newview/llavataractions.h @@ -216,7 +216,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(const std::vector<LLAvatarName> avatar_names, std::string& residents_string); + static void buildResidentsString(std::vector<LLAvatarName> avatar_names, std::string& residents_string); /** * Builds a string of residents' display names separated by "words_separator" string. |