From 571bdc9fcfaec5182f6f020b6a31815ad9696da7 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Sat, 8 May 2010 16:25:10 -0500
Subject: Revert "disable voice temporaryly where no caps avail (renables on
 parcel change)"

It could potentially have unintended consequences for private voice
conversations.

This reverts commit f6ed529f2237975fb9a205cc6340a7159e44a404.
---
 linden/indra/newview/llvoiceclient.h | 2 --
 1 file changed, 2 deletions(-)

(limited to 'linden/indra/newview/llvoiceclient.h')

diff --git a/linden/indra/newview/llvoiceclient.h b/linden/indra/newview/llvoiceclient.h
index d2ec752..cfc336b 100644
--- a/linden/indra/newview/llvoiceclient.h
+++ b/linden/indra/newview/llvoiceclient.h
@@ -330,7 +330,6 @@ static	void updatePosition(void);
 			bool		mIsP2P;
 			bool		mIncoming;
 			bool		mVoiceEnabled;
-			bool		mVoiceTemporaryDisabled;
 			bool		mReconnect;	// Whether we should try to reconnect to this session if it's dropped
 			// Set to true when the mute state of someone in the participant list changes.
 			// The code will have to walk the list to find the changed participant(s).
@@ -726,7 +725,6 @@ static	std::string nameFromsipURI(const std::string &uri);
 		bool		mMicVolumeDirty;
 		
 		bool		mVoiceEnabled;
-		bool		mVoiceTemporaryDisabled;
 		bool		mWriteInProgress;
 		std::string mWriteString;
 		size_t		mWriteOffset;
-- 
cgit v1.1