From b19d639d165f9ba025886d960b863bb9291cf847 Mon Sep 17 00:00:00 2001 From: Armin Weatherwax Date: Fri, 27 Nov 2009 14:04:22 +0100 Subject: Fixed log spam about missing ParcelVoiceInfoRequest capability. SNOW-66 fix by Armin. SNOW-250 fix by Pixel Gausman and Aleric Inglewood. (Cherry picked by Jacek from 3a84d801) --- ChangeLog.txt | 9 +++++++++ linden/indra/newview/llvoiceclient.cpp | 15 ++++++++++++++- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index a86a271..51a0794 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -200,6 +200,15 @@ modified: linden/indra/develop.py +2009-11-27 Armin Weatherwax + + * Fixed log spam about missing ParcelVoiceInfoRequest capability. + SNOW-66 fix by Armin. + SNOW-250 fix by Pixel Gausman and Aleric Inglewood. + + modified: linden/indra/develop.py + + 2009-11-26 Jacek Antonelli * Reverted "Updated primbackup from latest meerkat svn (r246)" diff --git a/linden/indra/newview/llvoiceclient.cpp b/linden/indra/newview/llvoiceclient.cpp index 94407ed..7a41510 100644 --- a/linden/indra/newview/llvoiceclient.cpp +++ b/linden/indra/newview/llvoiceclient.cpp @@ -1560,6 +1560,7 @@ void LLVoiceClient::stateMachine() } // Check for parcel boundary crossing + if(mVoiceEnabled) { LLViewerRegion *region = gAgent.getRegion(); LLParcel *parcel = LLViewerParcelMgr::getInstance()->getAgentParcel(); @@ -1590,7 +1591,19 @@ void LLVoiceClient::stateMachine() } else { - LL_WARNS("Voice") << "region doesn't have ParcelVoiceInfoRequest capability. This is normal for a short time after teleporting, but bad if it persists for very long." << LL_ENDL; + static int count = 0; + static int count2 = 0; + static int num = 1; + ++count; + if (count % num == 0) + { + 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; + if (num < 1000 && ++count2 == 10) + { + num *= 10; + count2 = 0; + } + } } } } -- cgit v1.1