From 7abecb48babe6a6f09bf6692ba55076546cfced9 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Mon, 1 Dec 2008 17:39:58 -0600 Subject: Second Life viewer sources 1.22.0-RC --- linden/indra/newview/llfloateractivespeakers.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'linden/indra/newview/llfloateractivespeakers.cpp') diff --git a/linden/indra/newview/llfloateractivespeakers.cpp b/linden/indra/newview/llfloateractivespeakers.cpp index 2352be3..bee6155 100644 --- a/linden/indra/newview/llfloateractivespeakers.cpp +++ b/linden/indra/newview/llfloateractivespeakers.cpp @@ -47,6 +47,7 @@ #include "llsdutil.h" #include "llimview.h" #include "llviewerwindow.h" +#include "llappviewer.h" const F32 SPEAKER_TIMEOUT = 10.f; // seconds of not being on voice channel before removed from list of active speakers const F32 RESORT_TIMEOUT = 5.f; // seconds of mouse inactivity before it's ok to sort regardless of mouse-in-view. @@ -1358,6 +1359,11 @@ void LLLocalSpeakerMgr::updateSpeakerList() // pull speakers from voice channel LLSpeakerMgr::updateSpeakerList(); + if (gDisconnected)//the world is cleared. + { + return ; + } + // add non-voice speakers in chat range std::vector< LLCharacter* >::iterator avatar_it; for(avatar_it = LLCharacter::sInstances.begin(); avatar_it != LLCharacter::sInstances.end(); ++avatar_it) -- cgit v1.1