diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-03-28 07:20:46 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-03-28 07:20:46 -0400 |
| commit | bfc52a2d75f5b957fb58c94c40d8b3e8748d288e (patch) | |
| tree | c70668b1f30316464bdddf160893f61d937953ce /indra/newview/llvoavatar.h | |
| parent | ef544a22218d59c6a121d4bf88c49868a2b9a713 (diff) | |
| parent | a53b017badb8b9a87549b1eae94bd0b483fea977 (diff) | |
merge changes for DRTVWR-305
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; |