diff options
| author | prep@lindenlab.com <prep@lindenlab.com> | 2013-03-29 10:37:58 -0500 |
|---|---|---|
| committer | prep@lindenlab.com <prep@lindenlab.com> | 2013-03-29 10:37:58 -0500 |
| commit | 0f24668b0a834e37a3a8767abc7b0ee51bf23fcd (patch) | |
| tree | 4ae685f79c3964e1ac7246641fa9d957b25b5ee1 /indra/newview/llvoavatar.h | |
| parent | 8e6d2f8ddc3fe8a1eee3abe99eb5abd3575c5841 (diff) | |
| parent | a62a824efb89aff3056d0659ee2c23ad6d15eeaa (diff) | |
Merged in Chui beta6+ fixes
Diffstat (limited to 'indra/newview/llvoavatar.h')
| -rwxr-xr-x | 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 c2adaac18e..ac31e7252c 100755 --- a/indra/newview/llvoavatar.h +++ b/indra/newview/llvoavatar.h @@ -855,7 +855,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; |