aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview
diff options
context:
space:
mode:
authorArmin Weatherwax2010-03-25 12:27:30 +0100
committerArmin Weatherwax2010-04-12 17:11:04 +0200
commite0fdedff3ef4c94384b0b222c36b6c51a062fb65 (patch)
tree6f4fcd4edbec824da6b2f7502db3a887979335b7 /linden/indra/newview
parentrespect --grid and --login (and --loginuri over --grid). (diff)
downloadmeta-impy-e0fdedff3ef4c94384b0b222c36b6c51a062fb65.zip
meta-impy-e0fdedff3ef4c94384b0b222c36b6c51a062fb65.tar.gz
meta-impy-e0fdedff3ef4c94384b0b222c36b6c51a062fb65.tar.bz2
meta-impy-e0fdedff3ef4c94384b0b222c36b6c51a062fb65.tar.xz
despam voice client: no ProvisionVoiceAccountRequest capability
Diffstat (limited to 'linden/indra/newview')
-rw-r--r--linden/indra/newview/llvoiceclient.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/newview/llvoiceclient.cpp b/linden/indra/newview/llvoiceclient.cpp
index 7a41510..ef817cf 100644
--- a/linden/indra/newview/llvoiceclient.cpp
+++ b/linden/indra/newview/llvoiceclient.cpp
@@ -1856,7 +1856,7 @@ void LLVoiceClient::stateMachine()
1856 // We never started up the connector. This will shut down the daemon. 1856 // We never started up the connector. This will shut down the daemon.
1857 setState(stateConnectorStopped); 1857 setState(stateConnectorStopped);
1858 } 1858 }
1859 else if(!mAccountName.empty()) 1859 else if(!mAccountName.empty() && mVoiceEnabled)
1860 { 1860 {
1861 LLViewerRegion *region = gAgent.getRegion(); 1861 LLViewerRegion *region = gAgent.getRegion();
1862 1862
@@ -1872,7 +1872,7 @@ void LLVoiceClient::stateMachine()
1872 } 1872 }
1873 else 1873 else
1874 { 1874 {
1875 LL_WARNS("Voice") << "region doesn't have ProvisionVoiceAccountRequest capability!" << LL_ENDL; 1875 LL_DEBUGS("Voice") << "region doesn't have ProvisionVoiceAccountRequest capability!" << LL_ENDL;
1876 } 1876 }
1877 } 1877 }
1878 } 1878 }