diff options
| author | Christian Goetze <cg@lindenlab.com> | 2007-10-10 00:01:43 +0000 |
|---|---|---|
| committer | Christian Goetze <cg@lindenlab.com> | 2007-10-10 00:01:43 +0000 |
| commit | 5ec8bbbe2244ea70d8aa74b5c572351632699425 (patch) | |
| tree | 12a4e92720c531105a21ef4f9f363b8572d72a3a /indra/newview/llvoiceclient.h | |
| parent | b3b62c3b9ef32c4dbcae51cd3ef582734d5717bb (diff) | |
svn merge -r71238:71367 svn+ssh://svn/svn/linden/branches/maint-ui-qa3
Diffstat (limited to 'indra/newview/llvoiceclient.h')
| -rw-r--r-- | indra/newview/llvoiceclient.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llvoiceclient.h b/indra/newview/llvoiceclient.h index ee7d18c0c8..ed256b6f8c 100644 --- a/indra/newview/llvoiceclient.h +++ b/indra/newview/llvoiceclient.h @@ -445,7 +445,7 @@ class LLVoiceClient: public LLSingleton<LLVoiceClient> // It initiates the call to the server that gets the parcel channel. void parcelChanged(); - void switchChannel(std::string uri = "", bool spatial = true, bool noReconnect = false, std::string hash = ""); + void switchChannel(std::string uri = std::string(), bool spatial = true, bool noReconnect = false, std::string hash = ""); void joinSession(std::string handle, std::string uri); std::string nameFromAvatar(LLVOAvatar *avatar); @@ -526,3 +526,4 @@ extern LLVoiceClient *gVoiceClient; #endif //LL_VOICE_CLIENT_H + |