diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-03-28 11:31:30 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-03-28 11:31:30 -0400 |
| commit | 621085d553cccc4238d74886ca44bcefafddd7f1 (patch) | |
| tree | 501a4726d0084e119691b397858420e6e202fa0d /indra/newview/llvoicevivox.h | |
| parent | 716aef71c46ea3d33157d7007172d140040bd19c (diff) | |
| parent | 130e4e510198147664a2377b62b22d8e42f00f04 (diff) | |
merge changes for 3.5.0-beta6
Diffstat (limited to 'indra/newview/llvoicevivox.h')
| -rw-r--r-- | indra/newview/llvoicevivox.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llvoicevivox.h b/indra/newview/llvoicevivox.h index 574027de42..a6f40eb3e9 100644 --- a/indra/newview/llvoicevivox.h +++ b/indra/newview/llvoicevivox.h @@ -584,7 +584,6 @@ protected: bool mNameResolved; bool mInSLFriends; bool mInVivoxBuddies; - bool mNeedsNameUpdate; }; typedef std::map<std::string, buddyListEntry*> buddyListMap; |