aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llvoiceclient.cpp
diff options
context:
space:
mode:
authorArmin Weatherwax2010-05-04 20:10:29 +0200
committerArmin Weatherwax2010-05-04 20:10:29 +0200
commit58ed680d530daf9852d00d33275594dc713ccdac (patch)
tree279628334309b655248d8544757cbced2ff1db0d /linden/indra/newview/llvoiceclient.cpp
parentreplace ambiguous NULL pointers for g_object. (diff)
downloadmeta-impy-58ed680d530daf9852d00d33275594dc713ccdac.zip
meta-impy-58ed680d530daf9852d00d33275594dc713ccdac.tar.gz
meta-impy-58ed680d530daf9852d00d33275594dc713ccdac.tar.bz2
meta-impy-58ed680d530daf9852d00d33275594dc713ccdac.tar.xz
disable speakers button and hide floateractivespeakers if voice not enabled.
Diffstat (limited to 'linden/indra/newview/llvoiceclient.cpp')
-rw-r--r--linden/indra/newview/llvoiceclient.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/newview/llvoiceclient.cpp b/linden/indra/newview/llvoiceclient.cpp
index 2c46832..c0d73e7 100644
--- a/linden/indra/newview/llvoiceclient.cpp
+++ b/linden/indra/newview/llvoiceclient.cpp
@@ -1605,7 +1605,7 @@ void LLVoiceClient::stateMachine()
1605 if (count % num == 0) 1605 if (count % num == 0)
1606 { 1606 {
1607 LL_DEBUGS("Voice") << "region doesn't have ParcelVoiceInfoRequest capability. This is normal for a short time after teleporting, but bad if it persists for very long (" << count << ")." << LL_ENDL; 1607 LL_DEBUGS("Voice") << "region doesn't have ParcelVoiceInfoRequest capability. This is normal for a short time after teleporting, but bad if it persists for very long (" << count << ")." << LL_ENDL;
1608 if (num < 1000) 1608 if (num < 100)
1609 { 1609 {
1610 if( ++count2 == 10) 1610 if( ++count2 == 10)
1611 { 1611 {