From 6a8f304b10f5a2fc96a675a8ada694e6bfbda34e Mon Sep 17 00:00:00 2001
From: Armin Weatherwax
Date: Fri, 1 Oct 2010 21:32:08 +0200
Subject: replacent for f99376788 Fixed #381: using voice causes viewer crash
 on disconnect/quit

---
 linden/indra/newview/llappviewer.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'linden/indra')

diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index accc523..3f9adde 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -1185,8 +1185,11 @@ bool LLAppViewer::cleanup()
 
 	llinfos << "Viewer disconnected" << llendflush;
 
-	//this deletes all your buddies
-	LLAvatarTracker::instance().reset();
+	if (!mQuitRequested)			//not doing it on quit, because the quitting voiceclient
+	{					//*might* crash imprudence TODO: fix the voiceclient instead
+		//this deletes all your buddies
+		LLAvatarTracker::instance().reset();
+	}
 
 	if (mQuitRequested)
 	{
-- 
cgit v1.1