summaryrefslogtreecommitdiff
path: root/indra/newview/llvoiceclient.h
diff options
context:
space:
mode:
authorRoxie Linden <roxie@lindenlab.com>2010-04-19 12:52:43 -0700
committerRoxie Linden <roxie@lindenlab.com>2010-04-19 12:52:43 -0700
commit6823879c1ad2260e553bc6a641975ca478848f3b (patch)
treee1d52fee4f7df59e845abc0a30716837c2fb766a /indra/newview/llvoiceclient.h
parentd66c242fea8a846f087562d5ae2b32c50a3f5ef1 (diff)
CR Changes from Aimee
Diffstat (limited to 'indra/newview/llvoiceclient.h')
-rw-r--r--indra/newview/llvoiceclient.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llvoiceclient.h b/indra/newview/llvoiceclient.h
index d4b4f07651..7427ea323f 100644
--- a/indra/newview/llvoiceclient.h
+++ b/indra/newview/llvoiceclient.h
@@ -176,7 +176,7 @@ public:
//@{
// start a voice channel with the specified user
virtual void callUser(const LLUUID &uuid)=0;
- virtual bool invitePending(std::string& channelHandle)=0;
+ virtual bool isValidChannel(std::string& channelHandle)=0;
virtual bool answerInvite(std::string &channelHandle)=0;
virtual void declineInvite(std::string &channelHandle)=0;
//@}
@@ -326,7 +326,7 @@ static const F32 OVERDRIVEN_POWER_LEVEL;
std::string getCurrentChannel();
// start a voice channel with the specified user
void callUser(const LLUUID &uuid);
- bool invitePending(std::string& channelHandle);
+ bool isValidChannel(std::string& channelHandle);
bool answerInvite(std::string &channelHandle);
void declineInvite(std::string &channelHandle);
void leaveChannel(void); // call this on logout or teleport begin