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/llvoicevivox.h | |
parent | ef544a22218d59c6a121d4bf88c49868a2b9a713 (diff) | |
parent | a53b017badb8b9a87549b1eae94bd0b483fea977 (diff) |
merge changes for DRTVWR-305
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; |