summaryrefslogtreecommitdiff
path: root/indra/newview/llvoiceclient.cpp
diff options
context:
space:
mode:
authorsimon <none@none>2014-10-09 11:07:33 -0700
committersimon <none@none>2014-10-09 11:07:33 -0700
commite8a5c06dc47bbd1965c852890446f9d8b9d2c68b (patch)
treebcc8835cb8ccf49bc11a2534f9759dad1d5bd1c2 /indra/newview/llvoiceclient.cpp
parentd7db567f27e6cc30aaffaf38d6ea219a7adf4678 (diff)
parentfa4fdedf51e37a195f5ee6688f1e3a7a0e2bf160 (diff)
Merge downstream code and become 3.7.18
Diffstat (limited to 'indra/newview/llvoiceclient.cpp')
-rwxr-xr-xindra/newview/llvoiceclient.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp
index 0bf373f478..962cdf0268 100755
--- a/indra/newview/llvoiceclient.cpp
+++ b/indra/newview/llvoiceclient.cpp
@@ -161,6 +161,13 @@ void LLVoiceClient::userAuthorized(const std::string& user_id, const LLUUID &age
mVoiceModule->userAuthorized(user_id, agentID);
}
+void LLVoiceClient::setHidden(bool hidden)
+{
+ if (mVoiceModule)
+ {
+ mVoiceModule->setHidden(hidden);
+ }
+}
void LLVoiceClient::terminate()
{