diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-07 10:40:38 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-07 10:40:38 +0100 |
| commit | ec0be6639058c9fa242f8fd9c0380bef44c02e1d (patch) | |
| tree | 79730fa38b4f1952571d66bb1bc08e9691711b41 /indra/newview/llvoicechannel.h | |
| parent | a7085418df1ada6e19b94b6df772ed21e663d119 (diff) | |
| parent | 0bb3f144c0a6712a269246975635962b3b5f48d0 (diff) | |
merged backout.
Diffstat (limited to 'indra/newview/llvoicechannel.h')
| -rw-r--r-- | indra/newview/llvoicechannel.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llvoicechannel.h b/indra/newview/llvoicechannel.h index 573fab1f4f..941cccacc3 100644 --- a/indra/newview/llvoicechannel.h +++ b/indra/newview/llvoicechannel.h @@ -98,8 +98,7 @@ public: static LLVoiceChannel* getChannelByID(const LLUUID& session_id); static LLVoiceChannel* getChannelByURI(std::string uri); - static LLVoiceChannel* getCurrentVoiceChannel(); - + static LLVoiceChannel* getCurrentVoiceChannel() { return sCurrentVoiceChannel; } static void initClass(); static void suspend(); |