From 3a84d8017df08447b14161cee3c24382f8f96013 Mon Sep 17 00:00:00 2001
From: Armin Weatherwax
Date: Fri, 27 Nov 2009 14:04:22 +0100
Subject: don't let the voice client spam about ParcelVoiceInfoRequest
 capability (SNOW-66 fix by me + SNOW-250 fix by Pixel Gausman and Aleric
 Inglewood )

	modified:   linden/indra/newview/llvoiceclient.cpp
---
 linden/indra/newview/llvoiceclient.cpp | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

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