diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-06-08 16:33:02 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-06-08 16:33:02 -0400 |
| commit | 949942c730b0b7463338c2cb3bc411ac12f4f648 (patch) | |
| tree | 159b9cf6bb6a9de9b538f17e3d721be25a15b79a /indra/newview/llconversationmodel.h | |
| parent | a219cf1c98527faa0e7addeb9660f679208bb0e7 (diff) | |
| parent | f3c58f765c0168f25bb13c4427e34b4bdad2f671 (diff) | |
merge changes for 3.7.29-release
Diffstat (limited to 'indra/newview/llconversationmodel.h')
| -rw-r--r-- | indra/newview/llconversationmodel.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llconversationmodel.h b/indra/newview/llconversationmodel.h index 56e1a26709..deff94ea16 100644 --- a/indra/newview/llconversationmodel.h +++ b/indra/newview/llconversationmodel.h @@ -213,7 +213,6 @@ private: void onAvatarNameCache(const LLAvatarName& av_name); // callback used by fetchAvatarName void updateName(const LLAvatarName& av_name); - bool mIsMuted; // default is false bool mIsModerator; // default is false bool mDisplayModeratorLabel; // default is false std::string mDisplayName; |