summaryrefslogtreecommitdiff
path: root/indra/newview/llvoicechannel.h
diff options
context:
space:
mode:
authorRoxie Linden <roxie@lindenlab.com>2010-04-07 11:08:04 -0700
committerRoxie Linden <roxie@lindenlab.com>2010-04-07 11:08:04 -0700
commit658ccc3e85487f9f24ff3b5926e60d6cce7f42e0 (patch)
treefe3f862878af5793aeec797d63c1d7c114d3c68d /indra/newview/llvoicechannel.h
parent0bb3f144c0a6712a269246975635962b3b5f48d0 (diff)
Re-insert backed out SLE checkin so we can fix it
Diffstat (limited to 'indra/newview/llvoicechannel.h')
-rw-r--r--indra/newview/llvoicechannel.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llvoicechannel.h b/indra/newview/llvoicechannel.h
index 941cccacc3..573fab1f4f 100644
--- a/indra/newview/llvoicechannel.h
+++ b/indra/newview/llvoicechannel.h
@@ -98,7 +98,8 @@ public:
static LLVoiceChannel* getChannelByID(const LLUUID& session_id);
static LLVoiceChannel* getChannelByURI(std::string uri);
- static LLVoiceChannel* getCurrentVoiceChannel() { return sCurrentVoiceChannel; }
+ static LLVoiceChannel* getCurrentVoiceChannel();
+
static void initClass();
static void suspend();