diff options
| author | James Cook <james@lindenlab.com> | 2010-05-13 15:47:32 -0700 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2010-05-13 15:47:32 -0700 |
| commit | 8b524549902b780c2833691368bc35bdb1837cd9 (patch) | |
| tree | b742a7f5463fb42663fa51e1029c80671ceb881b /indra/newview/llvoicechannel.h | |
| parent | 14f423a23c38bf554e9633752074fbcabd92599c (diff) | |
| parent | aebb49520b1919e0ac2bcc7373fc2db031e3b7f0 (diff) | |
merge pull from dessie/viewer-public, picking up SLE code
Diffstat (limited to 'indra/newview/llvoicechannel.h')
| -rw-r--r-- | indra/newview/llvoicechannel.h | 3 |
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(); |