From 3a5ae14b85d0ba8d562cddaa06f6c0bc0dccde33 Mon Sep 17 00:00:00 2001 From: Mike Antipov Date: Tue, 13 Apr 2010 18:26:36 +0300 Subject: Completed normal subtask EXT-6621 (Code cleanup: Remove unused LLFloaterActiveSpeakers and related classes from viewer) * Removed llfloateractivespeacker.h/cpp from CMakeLists.txt and from the repo. * Removed llmediaremotectrl.h/cpp, llvoiceremotectrl.h/cpp from the repo (were not in CMakeLists.txt). * Unused in 2.0 setings ("ShowVoiceChannelPopup" & "ShowVolumeSettingsPopup") are moved to the end of settings.xml (to not affect 1.23 if remove). * Removed xml files related to Active Speakers floater and old Communication floater (related cpp files have been already removed). Also removed their localized versions. * Also removed old textures related to removed xml and unused in 2.0 anymore. Reviewed by Vadim at https://codereview.productengine.com/secondlife/r/226/ --HG-- branch : product-engine --- indra/newview/llvoiceclient.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview/llvoiceclient.cpp') diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp index 2238acd643..298ce3fcec 100644 --- a/indra/newview/llvoiceclient.cpp +++ b/indra/newview/llvoiceclient.cpp @@ -5150,7 +5150,7 @@ LLVoiceClient::participantState *LLVoiceClient::sessionState::addParticipant(con else { // Create a UUID by hashing the URI, but do NOT set mAvatarIDValid. - // This tells both code in LLVoiceClient and code in llfloateractivespeakers.cpp that the ID will not be in the name cache. + // This tells code in LLVoiceClient that the ID will not be in the name cache. setUUIDFromStringHash(result->mAvatarID, uri); } } -- cgit v1.2.3