From ae81cf5dc466c3e10deef4be847076a1da9e7606 Mon Sep 17 00:00:00 2001 From: Aimee Linden Date: Thu, 16 Sep 2010 17:51:27 +0100 Subject: STORM-122 FIXED Clean up obsolete floaters and related dead code Removed obsolete XUI files: floater_activeim.xml floater_customize.xml floater_device_settings.xml floater_first_time_tip.xml floater_im.xml floater_my_friends.xml floater_outfit_save_as.xml floater_preview_classified.xml floater_preview_event.xml floater_preview_gesture_info.xml floater_preview_gesture_shortcut.xml floater_preview_gesture_steps.xml floater_statistics.xml floater_wearable_save_as.xml panel_audio_device.xml panel_friends.xml panel_groups.xml panel_nearby_chat.xml panel_online_status.xml panel_region_general_layout.xml Killed obsolete LLFloaterVoiceDeviceSettings class, and moved LLPanelVoiceDeviceSettings into its own appropriately named files. --- indra/newview/llviewerfloaterreg.cpp | 2 -- 1 file changed, 2 deletions(-) (limited to 'indra/newview/llviewerfloaterreg.cpp') diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp index b6f2d34663..7490ccf77a 100644 --- a/indra/newview/llviewerfloaterreg.cpp +++ b/indra/newview/llviewerfloaterreg.cpp @@ -95,7 +95,6 @@ #include "llfloatertos.h" #include "llfloatertopobjects.h" #include "llfloateruipreview.h" -#include "llfloatervoicedevicesettings.h" #include "llfloatervoiceeffect.h" #include "llfloaterwater.h" #include "llfloaterwhitelistentry.h" @@ -202,7 +201,6 @@ void LLViewerFloaterReg::registerFloaters() LLFloaterReg::add("prefs_hardware_settings", "floater_hardware_settings.xml", (LLFloaterBuildFunc)&LLFloaterReg::build); LLFloaterReg::add("perm_prefs", "floater_perm_prefs.xml", (LLFloaterBuildFunc)&LLFloaterReg::build); LLFloaterReg::add("pref_joystick", "floater_joystick.xml", (LLFloaterBuildFunc)&LLFloaterReg::build); - LLFloaterReg::add("pref_voicedevicesettings", "floater_device_settings.xml", (LLFloaterBuildFunc)&LLFloaterReg::build); LLFloaterReg::add("preview_anim", "floater_preview_animation.xml", (LLFloaterBuildFunc)&LLFloaterReg::build, "preview"); LLFloaterReg::add("preview_gesture", "floater_preview_gesture.xml", (LLFloaterBuildFunc)&LLFloaterReg::build, "preview"); LLFloaterReg::add("preview_notecard", "floater_preview_notecard.xml", (LLFloaterBuildFunc)&LLFloaterReg::build, "preview"); -- cgit v1.2.3