From cbde80b8795cddf21125652ef8987e023b650e32 Mon Sep 17 00:00:00 2001
From: Igor Borovkov <iborovkov@productengine.com>
Date: Thu, 28 Jan 2010 18:40:51 +0200
Subject: got rid of llfloaterfriends.h includes for  EXT-1196 Stalls on
 startup in LLPanelFriends::refreshNames

--HG--
branch : product-engine
---
 indra/newview/llvoiceclient.cpp | 2 --
 1 file changed, 2 deletions(-)

(limited to 'indra/newview/llvoiceclient.cpp')

diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp
index 8ca0fd6ef6..02a2d8c8cf 100644
--- a/indra/newview/llvoiceclient.cpp
+++ b/indra/newview/llvoiceclient.cpp
@@ -72,8 +72,6 @@
 #include "llvoavatarself.h"
 #include "llvoicechannel.h"
 
-#include "llfloaterfriends.h"  //VIVOX, inorder to refresh communicate panel
-
 // for base64 decoding
 #include "apr_base64.h"
 
-- 
cgit v1.2.3


From 3091c30af0b862ac3bac3ba72d33df27c0f15d97 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Thu, 28 Jan 2010 11:12:16 -0800
Subject: CID-370

Checker: UNINIT_CTOR
Function: LLVivoxProtocolParser::LLVivoxProtocolParser()
File: /indra/newview/llvoiceclient.cpp
---
 indra/newview/llvoiceclient.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'indra/newview/llvoiceclient.cpp')

diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp
index 8ca0fd6ef6..981fde2ffb 100644
--- a/indra/newview/llvoiceclient.cpp
+++ b/indra/newview/llvoiceclient.cpp
@@ -296,8 +296,14 @@ void LLVivoxProtocolParser::reset()
 	ignoringTags = false;
 	accumulateText = false;
 	energy = 0.f;
+	hasText = false;
+	hasAudio = false;
+	hasVideo = false;
+	terminated = false;
 	ignoreDepth = 0;
 	isChannel = false;
+	incoming = false;
+	enabled = false;
 	isEvent = false;
 	isLocallyMuted = false;
 	isModeratorMuted = false;
-- 
cgit v1.2.3


From 245c044e3b2b58e893c20137551fc1abda033fe5 Mon Sep 17 00:00:00 2001
From: Tofu Linden <tofu.linden@lindenlab.com>
Date: Thu, 28 Jan 2010 11:14:01 -0800
Subject: CID-369

Checker: UNINIT_CTOR
Function: LLVoiceClient::sessionState::sessionState()
File: /indra/newview/llvoiceclient.cpp
---
 indra/newview/llvoiceclient.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/llvoiceclient.cpp')

diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp
index 981fde2ffb..a0d42d9b5f 100644
--- a/indra/newview/llvoiceclient.cpp
+++ b/indra/newview/llvoiceclient.cpp
@@ -6414,6 +6414,7 @@ void LLVoiceClient::filePlaybackSetMode(bool vox, float speed)
 }
 
 LLVoiceClient::sessionState::sessionState() :
+	mErrorStatusCode(0),
 	mMediaStreamState(streamStateUnknown),
 	mTextStreamState(streamStateUnknown),
 	mCreateInProgress(false),
-- 
cgit v1.2.3