From 6220ce33700d011be5831b1bb480c81dec98665e Mon Sep 17 00:00:00 2001
From: MaximB ProductEngine <mberezhnoy@productengine.com>
Date: Mon, 5 Nov 2012 15:18:53 +0200
Subject: CHUI-450 (Your own name does not appear in nearby chat participant
 list if voice chat disabled)

---
 indra/newview/llvoicevivox.cpp | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp
index f1bf4a6d75..f236123ef1 100644
--- a/indra/newview/llvoicevivox.cpp
+++ b/indra/newview/llvoicevivox.cpp
@@ -394,7 +394,15 @@ const LLVoiceVersionInfo& LLVivoxVoiceClient::getVersion()
 
 void LLVivoxVoiceClient::updateSettings()
 {
-	setVoiceEnabled(gSavedSettings.getBOOL("EnableVoiceChat"));
+	if(!mAudioSession)
+	{
+		// If audio module is not initialized, pretend that voice is enabled, thus letting state machine to take a full cycle
+		setVoiceEnabled(true);
+	}
+	else
+	{
+		setVoiceEnabled(gSavedSettings.getBOOL("EnableVoiceChat"));
+	}
 	setEarLocation(gSavedSettings.getS32("VoiceEarLocation"));
 
 	std::string inputDevice = gSavedSettings.getString("VoiceInputAudioDevice");
@@ -1478,6 +1486,9 @@ void LLVivoxVoiceClient::stateMachine()
 					mUpdateTimer.setTimerExpirySec(UPDATE_THROTTLE_SECONDS);
 					sendPositionalUpdate();
 				}
+
+				// Now that audio module is fully initialized, check for actual mVoiceEnabled value
+				updateSettings();
 			}
 		break;
 		
-- 
cgit v1.2.3