diff options
| author | mberezhnoy <mberezhnoy@productengine.com> | 2013-03-25 21:57:01 +0200 |
|---|---|---|
| committer | mberezhnoy <mberezhnoy@productengine.com> | 2013-03-25 21:57:01 +0200 |
| commit | f86be5c85f30af83e761b0c94e089ec82532db48 (patch) | |
| tree | ebf4bba5b4dda31d4779a051d7f5cccf5e7ac6d1 /indra/newview/llvoavatar.h | |
| parent | 385de35b93f2df736ffd77f11a354d44e0a83d34 (diff) | |
| parent | 0af5b073e0557a4918d4094841c3a045a8c71ba9 (diff) | |
merge
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; |