aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llvoiceclient.h
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:11 -0500
committerJacek Antonelli2008-08-15 23:45:11 -0500
commit215f423cbe18fe9ca14a26caef918d303bad28ff (patch)
tree0743442b286216cc8e19aa487c26f4e9345ffd64 /linden/indra/newview/llvoiceclient.h
parentSecond Life viewer sources 1.18.3.5-RC (diff)
downloadmeta-impy-215f423cbe18fe9ca14a26caef918d303bad28ff.zip
meta-impy-215f423cbe18fe9ca14a26caef918d303bad28ff.tar.gz
meta-impy-215f423cbe18fe9ca14a26caef918d303bad28ff.tar.bz2
meta-impy-215f423cbe18fe9ca14a26caef918d303bad28ff.tar.xz
Second Life viewer sources 1.18.4.0-RC
Diffstat (limited to 'linden/indra/newview/llvoiceclient.h')
-rw-r--r--linden/indra/newview/llvoiceclient.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/linden/indra/newview/llvoiceclient.h b/linden/indra/newview/llvoiceclient.h
index e8c5b33..ed256b6 100644
--- a/linden/indra/newview/llvoiceclient.h
+++ b/linden/indra/newview/llvoiceclient.h
@@ -2,6 +2,8 @@
2 * @file llvoiceclient.h 2 * @file llvoiceclient.h
3 * @brief Declaration of LLVoiceClient class which is the interface to the voice client process. 3 * @brief Declaration of LLVoiceClient class which is the interface to the voice client process.
4 * 4 *
5 * $LicenseInfo:firstyear=2001&license=viewergpl$
6 *
5 * Copyright (c) 2001-2007, Linden Research, Inc. 7 * Copyright (c) 2001-2007, Linden Research, Inc.
6 * 8 *
7 * Second Life Viewer Source Code 9 * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
24 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO 26 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
25 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, 27 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
26 * COMPLETENESS OR PERFORMANCE. 28 * COMPLETENESS OR PERFORMANCE.
29 * $/LicenseInfo$
27 */ 30 */
28#ifndef LL_VOICE_CLIENT_H 31#ifndef LL_VOICE_CLIENT_H
29#define LL_VOICE_CLIENT_H 32#define LL_VOICE_CLIENT_H
@@ -442,7 +445,7 @@ class LLVoiceClient: public LLSingleton<LLVoiceClient>
442 // It initiates the call to the server that gets the parcel channel. 445 // It initiates the call to the server that gets the parcel channel.
443 void parcelChanged(); 446 void parcelChanged();
444 447
445 void switchChannel(std::string uri = "", bool spatial = true, bool noReconnect = false, std::string hash = ""); 448 void switchChannel(std::string uri = std::string(), bool spatial = true, bool noReconnect = false, std::string hash = "");
446 void joinSession(std::string handle, std::string uri); 449 void joinSession(std::string handle, std::string uri);
447 450
448 std::string nameFromAvatar(LLVOAvatar *avatar); 451 std::string nameFromAvatar(LLVOAvatar *avatar);
@@ -523,3 +526,4 @@ extern LLVoiceClient *gVoiceClient;
523#endif //LL_VOICE_CLIENT_H 526#endif //LL_VOICE_CLIENT_H
524 527
525 528
529