diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2013-08-26 18:54:39 -0400 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2013-08-26 18:54:39 -0400 |
| commit | f00b6c713347155fbde7e4c68e9656d29c13c6fc (patch) | |
| tree | 757be382d012da06b2d730f07d06eed41091fb67 /indra/newview/llvoiceclient.h | |
| parent | a45806e17cc99961ab559f544f43691ccafa9bf2 (diff) | |
| parent | 6e1138585bf745f73f0bb99ca62f77eeb273f1e4 (diff) | |
Merge. Pull in viewer-release after SSA merge.
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; |