diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-08-05 15:39:49 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-08-05 15:39:49 -0400 |
| commit | 561e0bb1a09e613e6fb41f6a31f1b182b9caa19c (patch) | |
| tree | 99affc11ead78852e5f4a57594a037859766e00a /indra/newview/llvoiceclient.h | |
| parent | efba897e45b5065619bbe0e1451a40b6391e503c (diff) | |
| parent | 32b8d398eca5eaa4ca99aa48839ad64d97954cae (diff) | |
merge changes for 3.6.2-release
Diffstat (limited to 'indra/newview/llvoiceclient.h')
| -rwxr-xr-x | indra/newview/llvoiceclient.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llvoiceclient.h b/indra/newview/llvoiceclient.h index 714dd6a9f2..e17da9cecd 100755 --- a/indra/newview/llvoiceclient.h +++ b/indra/newview/llvoiceclient.h @@ -199,7 +199,6 @@ public: //@{ virtual BOOL getVoiceEnabled(const LLUUID& id)=0; // true if we've received data for this avatar virtual std::string getDisplayName(const LLUUID& id)=0; - virtual BOOL isOnlineSIP(const LLUUID &id)=0; virtual BOOL isParticipantAvatar(const LLUUID &id)=0; virtual BOOL getIsSpeaking(const LLUUID& id)=0; virtual BOOL getIsModeratorMuted(const LLUUID& id)=0; |