diff options
author | Oz Linden <oz@lindenlab.com> | 2013-03-28 10:12:18 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2013-03-28 10:12:18 -0400 |
commit | 130e4e510198147664a2377b62b22d8e42f00f04 (patch) | |
tree | 14556a65468e06edcbf6f68c4b026fea16fcd070 /indra/newview/llvoavatar.h | |
parent | 515f0e5a559ff3f0cb7d02e1d40b0f71425800ea (diff) | |
parent | cf1747712b154b6984cf374cf9c86f68a1210fb3 (diff) |
merge changes for 3.5.0-beta6
Diffstat (limited to 'indra/newview/llvoavatar.h')
-rw-r--r-- | indra/newview/llvoavatar.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llvoavatar.h b/indra/newview/llvoavatar.h index c59a3a150c..9f1f209920 100644 --- a/indra/newview/llvoavatar.h +++ b/indra/newview/llvoavatar.h @@ -939,7 +939,7 @@ protected: static void getAnimLabels(LLDynamicArray<std::string>* labels); static void getAnimNames(LLDynamicArray<std::string>* names); private: - std::string mNameString; // UTF-8 title + name + status + bool mNameIsSet; std::string mTitle; bool mNameAway; bool mNameDoNotDisturb; |