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/CMakeLists.txt | 4 +- indra/newview/llfloaterpreference.cpp | 17 +- indra/newview/llfloatervoicedevicesettings.cpp | 393 --- indra/newview/llfloatervoicedevicesettings.h | 83 - indra/newview/llmorphview.h | 1 - indra/newview/llpaneloutfitsinventory.cpp | 9 - indra/newview/llpanelvoicedevicesettings.cpp | 322 ++ indra/newview/llpanelvoicedevicesettings.h | 61 + indra/newview/llviewerfloaterreg.cpp | 2 - .../skins/default/xui/da/floater_customize.xml | 530 --- .../default/xui/da/floater_device_settings.xml | 2 - indra/newview/skins/default/xui/da/floater_im.xml | 45 - .../skins/default/xui/da/floater_my_friends.xml | 7 - .../default/xui/da/floater_outfit_save_as.xml | 11 - .../default/xui/da/floater_preview_classified.xml | 6 - .../skins/default/xui/da/floater_preview_event.xml | 6 - .../xui/da/floater_preview_gesture_info.xml | 2 - .../xui/da/floater_preview_gesture_shortcut.xml | 15 - .../xui/da/floater_preview_gesture_steps.xml | 2 - .../skins/default/xui/da/floater_statistics.xml | 2 - .../default/xui/da/floater_wearable_save_as.xml | 11 - .../skins/default/xui/da/panel_audio_device.xml | 25 - .../newview/skins/default/xui/da/panel_friends.xml | 20 - .../newview/skins/default/xui/da/panel_groups.xml | 18 - .../skins/default/xui/da/panel_nearby_chat.xml | 9 - .../skins/default/xui/da/panel_online_status.xml | 2 - .../default/xui/da/panel_region_general_layout.xml | 43 - .../skins/default/xui/de/floater_customize.xml | 529 --- .../default/xui/de/floater_device_settings.xml | 2 - .../default/xui/de/floater_first_time_tip.xml | 4 - indra/newview/skins/default/xui/de/floater_im.xml | 46 - .../skins/default/xui/de/floater_my_friends.xml | 7 - .../default/xui/de/floater_outfit_save_as.xml | 12 - .../default/xui/de/floater_preview_classified.xml | 6 - .../skins/default/xui/de/floater_preview_event.xml | 6 - .../xui/de/floater_preview_gesture_info.xml | 2 - .../xui/de/floater_preview_gesture_shortcut.xml | 15 - .../xui/de/floater_preview_gesture_steps.xml | 2 - .../skins/default/xui/de/floater_statistics.xml | 2 - .../default/xui/de/floater_wearable_save_as.xml | 11 - .../skins/default/xui/de/panel_audio_device.xml | 25 - .../newview/skins/default/xui/de/panel_friends.xml | 31 - .../newview/skins/default/xui/de/panel_groups.xml | 15 - .../skins/default/xui/de/panel_nearby_chat.xml | 9 - .../skins/default/xui/de/panel_online_status.xml | 2 - .../default/xui/de/panel_region_general_layout.xml | 43 - .../skins/default/xui/en/floater_customize.xml | 3389 -------------------- .../default/xui/en/floater_device_settings.xml | 18 - .../default/xui/en/floater_first_time_tip.xml | 22 - indra/newview/skins/default/xui/en/floater_im.xml | 80 - .../skins/default/xui/en/floater_my_friends.xml | 45 - .../default/xui/en/floater_outfit_save_as.xml | 58 - .../default/xui/en/floater_preview_classified.xml | 24 - .../skins/default/xui/en/floater_preview_event.xml | 24 - .../xui/en/floater_preview_gesture_info.xml | 57 - .../xui/en/floater_preview_gesture_shortcut.xml | 88 - .../xui/en/floater_preview_gesture_steps.xml | 242 -- .../skins/default/xui/en/floater_statistics.xml | 12 - .../default/xui/en/floater_wearable_save_as.xml | 56 - .../skins/default/xui/en/panel_audio_device.xml | 152 - .../newview/skins/default/xui/en/panel_friends.xml | 124 - .../newview/skins/default/xui/en/panel_groups.xml | 111 - .../skins/default/xui/en/panel_nearby_chat.xml | 27 - .../skins/default/xui/en/panel_online_status.xml | 35 - .../default/xui/en/panel_region_general_layout.xml | 242 -- .../skins/default/xui/es/floater_customize.xml | 530 --- .../default/xui/es/floater_device_settings.xml | 2 - indra/newview/skins/default/xui/es/floater_im.xml | 45 - .../skins/default/xui/es/floater_my_friends.xml | 7 - .../default/xui/es/floater_outfit_save_as.xml | 12 - .../default/xui/es/floater_preview_classified.xml | 6 - .../skins/default/xui/es/floater_preview_event.xml | 6 - .../xui/es/floater_preview_gesture_info.xml | 2 - .../xui/es/floater_preview_gesture_shortcut.xml | 15 - .../xui/es/floater_preview_gesture_steps.xml | 2 - .../skins/default/xui/es/floater_statistics.xml | 2 - .../default/xui/es/floater_wearable_save_as.xml | 11 - .../skins/default/xui/es/panel_audio_device.xml | 25 - .../newview/skins/default/xui/es/panel_friends.xml | 20 - .../newview/skins/default/xui/es/panel_groups.xml | 17 - .../skins/default/xui/es/panel_nearby_chat.xml | 9 - .../skins/default/xui/es/panel_online_status.xml | 2 - .../default/xui/es/panel_region_general_layout.xml | 43 - .../skins/default/xui/fr/floater_customize.xml | 530 --- .../default/xui/fr/floater_device_settings.xml | 2 - .../default/xui/fr/floater_first_time_tip.xml | 4 - indra/newview/skins/default/xui/fr/floater_im.xml | 45 - .../skins/default/xui/fr/floater_my_friends.xml | 7 - .../default/xui/fr/floater_outfit_save_as.xml | 12 - .../default/xui/fr/floater_preview_classified.xml | 6 - .../skins/default/xui/fr/floater_preview_event.xml | 6 - .../xui/fr/floater_preview_gesture_info.xml | 2 - .../xui/fr/floater_preview_gesture_shortcut.xml | 15 - .../xui/fr/floater_preview_gesture_steps.xml | 2 - .../skins/default/xui/fr/floater_statistics.xml | 2 - .../default/xui/fr/floater_wearable_save_as.xml | 11 - .../skins/default/xui/fr/panel_audio_device.xml | 25 - .../newview/skins/default/xui/fr/panel_friends.xml | 20 - .../newview/skins/default/xui/fr/panel_groups.xml | 16 - .../skins/default/xui/fr/panel_nearby_chat.xml | 9 - .../skins/default/xui/fr/panel_online_status.xml | 2 - .../default/xui/fr/panel_region_general_layout.xml | 43 - .../skins/default/xui/it/floater_customize.xml | 530 --- .../default/xui/it/floater_device_settings.xml | 2 - indra/newview/skins/default/xui/it/floater_im.xml | 45 - .../skins/default/xui/it/floater_my_friends.xml | 7 - .../default/xui/it/floater_outfit_save_as.xml | 12 - .../default/xui/it/floater_preview_classified.xml | 6 - .../skins/default/xui/it/floater_preview_event.xml | 6 - .../xui/it/floater_preview_gesture_info.xml | 2 - .../xui/it/floater_preview_gesture_shortcut.xml | 15 - .../xui/it/floater_preview_gesture_steps.xml | 2 - .../skins/default/xui/it/floater_statistics.xml | 2 - .../default/xui/it/floater_wearable_save_as.xml | 11 - .../skins/default/xui/it/panel_audio_device.xml | 25 - .../newview/skins/default/xui/it/panel_friends.xml | 20 - .../newview/skins/default/xui/it/panel_groups.xml | 17 - .../skins/default/xui/it/panel_nearby_chat.xml | 9 - .../skins/default/xui/it/panel_online_status.xml | 2 - .../default/xui/it/panel_region_general_layout.xml | 43 - .../skins/default/xui/ja/floater_customize.xml | 529 --- .../default/xui/ja/floater_device_settings.xml | 2 - .../default/xui/ja/floater_first_time_tip.xml | 4 - indra/newview/skins/default/xui/ja/floater_im.xml | 46 - .../skins/default/xui/ja/floater_my_friends.xml | 7 - .../default/xui/ja/floater_outfit_save_as.xml | 12 - .../default/xui/ja/floater_preview_classified.xml | 6 - .../skins/default/xui/ja/floater_preview_event.xml | 6 - .../xui/ja/floater_preview_gesture_info.xml | 2 - .../xui/ja/floater_preview_gesture_shortcut.xml | 15 - .../xui/ja/floater_preview_gesture_steps.xml | 2 - .../skins/default/xui/ja/floater_statistics.xml | 2 - .../default/xui/ja/floater_wearable_save_as.xml | 11 - .../skins/default/xui/ja/panel_audio_device.xml | 26 - .../newview/skins/default/xui/ja/panel_friends.xml | 32 - .../newview/skins/default/xui/ja/panel_groups.xml | 16 - .../skins/default/xui/ja/panel_nearby_chat.xml | 9 - .../skins/default/xui/ja/panel_online_status.xml | 2 - .../default/xui/ja/panel_region_general_layout.xml | 43 - .../skins/default/xui/nl/floater_customize.xml | 469 --- indra/newview/skins/default/xui/nl/floater_im.xml | 45 - .../skins/default/xui/nl/floater_my_friends.xml | 7 - .../skins/default/xui/nl/floater_statistics.xml | 2 - .../skins/default/xui/nl/panel_audio_device.xml | 25 - .../newview/skins/default/xui/nl/panel_friends.xml | 20 - .../newview/skins/default/xui/nl/panel_groups.xml | 15 - .../skins/default/xui/pl/floater_customize.xml | 529 --- .../default/xui/pl/floater_device_settings.xml | 2 - indra/newview/skins/default/xui/pl/floater_im.xml | 45 - .../skins/default/xui/pl/floater_my_friends.xml | 7 - .../default/xui/pl/floater_outfit_save_as.xml | 12 - .../default/xui/pl/floater_preview_classified.xml | 6 - .../skins/default/xui/pl/floater_preview_event.xml | 6 - .../xui/pl/floater_preview_gesture_info.xml | 2 - .../xui/pl/floater_preview_gesture_shortcut.xml | 15 - .../xui/pl/floater_preview_gesture_steps.xml | 2 - .../skins/default/xui/pl/floater_statistics.xml | 2 - .../default/xui/pl/floater_wearable_save_as.xml | 11 - .../skins/default/xui/pl/panel_audio_device.xml | 26 - .../newview/skins/default/xui/pl/panel_friends.xml | 20 - .../newview/skins/default/xui/pl/panel_groups.xml | 18 - .../skins/default/xui/pl/panel_nearby_chat.xml | 9 - .../skins/default/xui/pl/panel_online_status.xml | 2 - .../default/xui/pl/panel_region_general_layout.xml | 43 - .../skins/default/xui/pt/floater_customize.xml | 530 --- .../default/xui/pt/floater_device_settings.xml | 2 - indra/newview/skins/default/xui/pt/floater_im.xml | 45 - .../skins/default/xui/pt/floater_my_friends.xml | 7 - .../default/xui/pt/floater_outfit_save_as.xml | 11 - .../default/xui/pt/floater_preview_classified.xml | 6 - .../skins/default/xui/pt/floater_preview_event.xml | 6 - .../xui/pt/floater_preview_gesture_info.xml | 2 - .../xui/pt/floater_preview_gesture_shortcut.xml | 15 - .../xui/pt/floater_preview_gesture_steps.xml | 2 - .../skins/default/xui/pt/floater_statistics.xml | 2 - .../default/xui/pt/floater_wearable_save_as.xml | 11 - .../skins/default/xui/pt/panel_audio_device.xml | 25 - .../newview/skins/default/xui/pt/panel_friends.xml | 20 - .../newview/skins/default/xui/pt/panel_groups.xml | 15 - .../skins/default/xui/pt/panel_nearby_chat.xml | 9 - .../skins/default/xui/pt/panel_online_status.xml | 2 - .../default/xui/pt/panel_region_general_layout.xml | 43 - 182 files changed, 386 insertions(+), 11973 deletions(-) delete mode 100644 indra/newview/llfloatervoicedevicesettings.cpp delete mode 100644 indra/newview/llfloatervoicedevicesettings.h create mode 100644 indra/newview/llpanelvoicedevicesettings.cpp create mode 100644 indra/newview/llpanelvoicedevicesettings.h delete mode 100644 indra/newview/skins/default/xui/da/floater_customize.xml delete mode 100644 indra/newview/skins/default/xui/da/floater_device_settings.xml delete mode 100644 indra/newview/skins/default/xui/da/floater_im.xml delete mode 100644 indra/newview/skins/default/xui/da/floater_my_friends.xml delete mode 100644 indra/newview/skins/default/xui/da/floater_outfit_save_as.xml delete mode 100644 indra/newview/skins/default/xui/da/floater_preview_classified.xml delete mode 100644 indra/newview/skins/default/xui/da/floater_preview_event.xml delete mode 100644 indra/newview/skins/default/xui/da/floater_preview_gesture_info.xml delete mode 100644 indra/newview/skins/default/xui/da/floater_preview_gesture_shortcut.xml delete mode 100644 indra/newview/skins/default/xui/da/floater_preview_gesture_steps.xml delete mode 100644 indra/newview/skins/default/xui/da/floater_statistics.xml delete mode 100644 indra/newview/skins/default/xui/da/floater_wearable_save_as.xml delete mode 100644 indra/newview/skins/default/xui/da/panel_audio_device.xml delete mode 100644 indra/newview/skins/default/xui/da/panel_friends.xml delete mode 100644 indra/newview/skins/default/xui/da/panel_groups.xml delete mode 100644 indra/newview/skins/default/xui/da/panel_nearby_chat.xml delete mode 100644 indra/newview/skins/default/xui/da/panel_online_status.xml delete mode 100644 indra/newview/skins/default/xui/da/panel_region_general_layout.xml delete mode 100644 indra/newview/skins/default/xui/de/floater_customize.xml delete mode 100644 indra/newview/skins/default/xui/de/floater_device_settings.xml delete mode 100644 indra/newview/skins/default/xui/de/floater_first_time_tip.xml delete mode 100644 indra/newview/skins/default/xui/de/floater_im.xml delete mode 100644 indra/newview/skins/default/xui/de/floater_my_friends.xml delete mode 100644 indra/newview/skins/default/xui/de/floater_outfit_save_as.xml delete mode 100644 indra/newview/skins/default/xui/de/floater_preview_classified.xml delete mode 100644 indra/newview/skins/default/xui/de/floater_preview_event.xml delete mode 100644 indra/newview/skins/default/xui/de/floater_preview_gesture_info.xml delete mode 100644 indra/newview/skins/default/xui/de/floater_preview_gesture_shortcut.xml delete mode 100644 indra/newview/skins/default/xui/de/floater_preview_gesture_steps.xml delete mode 100644 indra/newview/skins/default/xui/de/floater_statistics.xml delete mode 100644 indra/newview/skins/default/xui/de/floater_wearable_save_as.xml delete mode 100644 indra/newview/skins/default/xui/de/panel_audio_device.xml delete mode 100644 indra/newview/skins/default/xui/de/panel_friends.xml delete mode 100644 indra/newview/skins/default/xui/de/panel_groups.xml delete mode 100644 indra/newview/skins/default/xui/de/panel_nearby_chat.xml delete mode 100644 indra/newview/skins/default/xui/de/panel_online_status.xml delete mode 100644 indra/newview/skins/default/xui/de/panel_region_general_layout.xml delete mode 100644 indra/newview/skins/default/xui/en/floater_customize.xml delete mode 100644 indra/newview/skins/default/xui/en/floater_device_settings.xml delete mode 100644 indra/newview/skins/default/xui/en/floater_first_time_tip.xml delete mode 100644 indra/newview/skins/default/xui/en/floater_im.xml delete mode 100644 indra/newview/skins/default/xui/en/floater_my_friends.xml delete mode 100644 indra/newview/skins/default/xui/en/floater_outfit_save_as.xml delete mode 100644 indra/newview/skins/default/xui/en/floater_preview_classified.xml delete mode 100644 indra/newview/skins/default/xui/en/floater_preview_event.xml delete mode 100644 indra/newview/skins/default/xui/en/floater_preview_gesture_info.xml delete mode 100644 indra/newview/skins/default/xui/en/floater_preview_gesture_shortcut.xml delete mode 100644 indra/newview/skins/default/xui/en/floater_preview_gesture_steps.xml delete mode 100644 indra/newview/skins/default/xui/en/floater_statistics.xml delete mode 100644 indra/newview/skins/default/xui/en/floater_wearable_save_as.xml delete mode 100644 indra/newview/skins/default/xui/en/panel_audio_device.xml delete mode 100644 indra/newview/skins/default/xui/en/panel_friends.xml delete mode 100644 indra/newview/skins/default/xui/en/panel_groups.xml delete mode 100644 indra/newview/skins/default/xui/en/panel_nearby_chat.xml delete mode 100644 indra/newview/skins/default/xui/en/panel_online_status.xml delete mode 100644 indra/newview/skins/default/xui/en/panel_region_general_layout.xml delete mode 100644 indra/newview/skins/default/xui/es/floater_customize.xml delete mode 100644 indra/newview/skins/default/xui/es/floater_device_settings.xml delete mode 100644 indra/newview/skins/default/xui/es/floater_im.xml delete mode 100644 indra/newview/skins/default/xui/es/floater_my_friends.xml delete mode 100644 indra/newview/skins/default/xui/es/floater_outfit_save_as.xml delete mode 100644 indra/newview/skins/default/xui/es/floater_preview_classified.xml delete mode 100644 indra/newview/skins/default/xui/es/floater_preview_event.xml delete mode 100644 indra/newview/skins/default/xui/es/floater_preview_gesture_info.xml delete mode 100644 indra/newview/skins/default/xui/es/floater_preview_gesture_shortcut.xml delete mode 100644 indra/newview/skins/default/xui/es/floater_preview_gesture_steps.xml delete mode 100644 indra/newview/skins/default/xui/es/floater_statistics.xml delete mode 100644 indra/newview/skins/default/xui/es/floater_wearable_save_as.xml delete mode 100644 indra/newview/skins/default/xui/es/panel_audio_device.xml delete mode 100644 indra/newview/skins/default/xui/es/panel_friends.xml delete mode 100644 indra/newview/skins/default/xui/es/panel_groups.xml delete mode 100644 indra/newview/skins/default/xui/es/panel_nearby_chat.xml delete mode 100644 indra/newview/skins/default/xui/es/panel_online_status.xml delete mode 100644 indra/newview/skins/default/xui/es/panel_region_general_layout.xml delete mode 100644 indra/newview/skins/default/xui/fr/floater_customize.xml delete mode 100644 indra/newview/skins/default/xui/fr/floater_device_settings.xml delete mode 100644 indra/newview/skins/default/xui/fr/floater_first_time_tip.xml delete mode 100644 indra/newview/skins/default/xui/fr/floater_im.xml delete mode 100644 indra/newview/skins/default/xui/fr/floater_my_friends.xml delete mode 100644 indra/newview/skins/default/xui/fr/floater_outfit_save_as.xml delete mode 100644 indra/newview/skins/default/xui/fr/floater_preview_classified.xml delete mode 100644 indra/newview/skins/default/xui/fr/floater_preview_event.xml delete mode 100644 indra/newview/skins/default/xui/fr/floater_preview_gesture_info.xml delete mode 100644 indra/newview/skins/default/xui/fr/floater_preview_gesture_shortcut.xml delete mode 100644 indra/newview/skins/default/xui/fr/floater_preview_gesture_steps.xml delete mode 100644 indra/newview/skins/default/xui/fr/floater_statistics.xml delete mode 100644 indra/newview/skins/default/xui/fr/floater_wearable_save_as.xml delete mode 100644 indra/newview/skins/default/xui/fr/panel_audio_device.xml delete mode 100644 indra/newview/skins/default/xui/fr/panel_friends.xml delete mode 100644 indra/newview/skins/default/xui/fr/panel_groups.xml delete mode 100644 indra/newview/skins/default/xui/fr/panel_nearby_chat.xml delete mode 100644 indra/newview/skins/default/xui/fr/panel_online_status.xml delete mode 100644 indra/newview/skins/default/xui/fr/panel_region_general_layout.xml delete mode 100644 indra/newview/skins/default/xui/it/floater_customize.xml delete mode 100644 indra/newview/skins/default/xui/it/floater_device_settings.xml delete mode 100644 indra/newview/skins/default/xui/it/floater_im.xml delete mode 100644 indra/newview/skins/default/xui/it/floater_my_friends.xml delete mode 100644 indra/newview/skins/default/xui/it/floater_outfit_save_as.xml delete mode 100644 indra/newview/skins/default/xui/it/floater_preview_classified.xml delete mode 100644 indra/newview/skins/default/xui/it/floater_preview_event.xml delete mode 100644 indra/newview/skins/default/xui/it/floater_preview_gesture_info.xml delete mode 100644 indra/newview/skins/default/xui/it/floater_preview_gesture_shortcut.xml delete mode 100644 indra/newview/skins/default/xui/it/floater_preview_gesture_steps.xml delete mode 100644 indra/newview/skins/default/xui/it/floater_statistics.xml delete mode 100644 indra/newview/skins/default/xui/it/floater_wearable_save_as.xml delete mode 100644 indra/newview/skins/default/xui/it/panel_audio_device.xml delete mode 100644 indra/newview/skins/default/xui/it/panel_friends.xml delete mode 100644 indra/newview/skins/default/xui/it/panel_groups.xml delete mode 100644 indra/newview/skins/default/xui/it/panel_nearby_chat.xml delete mode 100644 indra/newview/skins/default/xui/it/panel_online_status.xml delete mode 100644 indra/newview/skins/default/xui/it/panel_region_general_layout.xml delete mode 100644 indra/newview/skins/default/xui/ja/floater_customize.xml delete mode 100644 indra/newview/skins/default/xui/ja/floater_device_settings.xml delete mode 100644 indra/newview/skins/default/xui/ja/floater_first_time_tip.xml delete mode 100644 indra/newview/skins/default/xui/ja/floater_im.xml delete mode 100644 indra/newview/skins/default/xui/ja/floater_my_friends.xml delete mode 100644 indra/newview/skins/default/xui/ja/floater_outfit_save_as.xml delete mode 100644 indra/newview/skins/default/xui/ja/floater_preview_classified.xml delete mode 100644 indra/newview/skins/default/xui/ja/floater_preview_event.xml delete mode 100644 indra/newview/skins/default/xui/ja/floater_preview_gesture_info.xml delete mode 100644 indra/newview/skins/default/xui/ja/floater_preview_gesture_shortcut.xml delete mode 100644 indra/newview/skins/default/xui/ja/floater_preview_gesture_steps.xml delete mode 100644 indra/newview/skins/default/xui/ja/floater_statistics.xml delete mode 100644 indra/newview/skins/default/xui/ja/floater_wearable_save_as.xml delete mode 100644 indra/newview/skins/default/xui/ja/panel_audio_device.xml delete mode 100644 indra/newview/skins/default/xui/ja/panel_friends.xml delete mode 100644 indra/newview/skins/default/xui/ja/panel_groups.xml delete mode 100644 indra/newview/skins/default/xui/ja/panel_nearby_chat.xml delete mode 100644 indra/newview/skins/default/xui/ja/panel_online_status.xml delete mode 100644 indra/newview/skins/default/xui/ja/panel_region_general_layout.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_customize.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_im.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_my_friends.xml delete mode 100644 indra/newview/skins/default/xui/nl/floater_statistics.xml delete mode 100644 indra/newview/skins/default/xui/nl/panel_audio_device.xml delete mode 100644 indra/newview/skins/default/xui/nl/panel_friends.xml delete mode 100644 indra/newview/skins/default/xui/nl/panel_groups.xml delete mode 100644 indra/newview/skins/default/xui/pl/floater_customize.xml delete mode 100644 indra/newview/skins/default/xui/pl/floater_device_settings.xml delete mode 100644 indra/newview/skins/default/xui/pl/floater_im.xml delete mode 100644 indra/newview/skins/default/xui/pl/floater_my_friends.xml delete mode 100644 indra/newview/skins/default/xui/pl/floater_outfit_save_as.xml delete mode 100644 indra/newview/skins/default/xui/pl/floater_preview_classified.xml delete mode 100644 indra/newview/skins/default/xui/pl/floater_preview_event.xml delete mode 100644 indra/newview/skins/default/xui/pl/floater_preview_gesture_info.xml delete mode 100644 indra/newview/skins/default/xui/pl/floater_preview_gesture_shortcut.xml delete mode 100644 indra/newview/skins/default/xui/pl/floater_preview_gesture_steps.xml delete mode 100644 indra/newview/skins/default/xui/pl/floater_statistics.xml delete mode 100644 indra/newview/skins/default/xui/pl/floater_wearable_save_as.xml delete mode 100644 indra/newview/skins/default/xui/pl/panel_audio_device.xml delete mode 100644 indra/newview/skins/default/xui/pl/panel_friends.xml delete mode 100644 indra/newview/skins/default/xui/pl/panel_groups.xml delete mode 100644 indra/newview/skins/default/xui/pl/panel_nearby_chat.xml delete mode 100644 indra/newview/skins/default/xui/pl/panel_online_status.xml delete mode 100644 indra/newview/skins/default/xui/pl/panel_region_general_layout.xml delete mode 100644 indra/newview/skins/default/xui/pt/floater_customize.xml delete mode 100644 indra/newview/skins/default/xui/pt/floater_device_settings.xml delete mode 100644 indra/newview/skins/default/xui/pt/floater_im.xml delete mode 100644 indra/newview/skins/default/xui/pt/floater_my_friends.xml delete mode 100644 indra/newview/skins/default/xui/pt/floater_outfit_save_as.xml delete mode 100644 indra/newview/skins/default/xui/pt/floater_preview_classified.xml delete mode 100644 indra/newview/skins/default/xui/pt/floater_preview_event.xml delete mode 100644 indra/newview/skins/default/xui/pt/floater_preview_gesture_info.xml delete mode 100644 indra/newview/skins/default/xui/pt/floater_preview_gesture_shortcut.xml delete mode 100644 indra/newview/skins/default/xui/pt/floater_preview_gesture_steps.xml delete mode 100644 indra/newview/skins/default/xui/pt/floater_statistics.xml delete mode 100644 indra/newview/skins/default/xui/pt/floater_wearable_save_as.xml delete mode 100644 indra/newview/skins/default/xui/pt/panel_audio_device.xml delete mode 100644 indra/newview/skins/default/xui/pt/panel_friends.xml delete mode 100644 indra/newview/skins/default/xui/pt/panel_groups.xml delete mode 100644 indra/newview/skins/default/xui/pt/panel_nearby_chat.xml delete mode 100644 indra/newview/skins/default/xui/pt/panel_online_status.xml delete mode 100644 indra/newview/skins/default/xui/pt/panel_region_general_layout.xml (limited to 'indra') diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt index 382bbaeba1..e3b998876f 100644 --- a/indra/newview/CMakeLists.txt +++ b/indra/newview/CMakeLists.txt @@ -216,7 +216,6 @@ set(viewer_SOURCE_FILES llfloatertos.cpp llfloateruipreview.cpp llfloaterurlentry.cpp - llfloatervoicedevicesettings.cpp llfloatervoiceeffect.cpp llfloaterwater.cpp llfloaterwhitelistentry.cpp @@ -363,6 +362,7 @@ set(viewer_SOURCE_FILES llpaneltiptoast.cpp llpanelvoiceeffect.cpp llpaneltopinfobar.cpp + llpanelvoicedevicesettings.cpp llpanelvolume.cpp llpanelvolumepulldown.cpp llpanelwearing.cpp @@ -744,7 +744,6 @@ set(viewer_HEADER_FILES llfloatertos.h llfloateruipreview.h llfloaterurlentry.h - llfloatervoicedevicesettings.h llfloatervoiceeffect.h llfloaterwater.h llfloaterwhitelistentry.h @@ -884,6 +883,7 @@ set(viewer_HEADER_FILES llpanelprofileview.h llpanelteleporthistory.h llpaneltiptoast.h + llpanelvoicedevicesettings.h llpanelvoiceeffect.h llpaneltopinfobar.h llpanelvolume.h diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index 3804a1b858..53ddf70abe 100644 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -49,7 +49,6 @@ #include "llfloaterreg.h" #include "llfloaterabout.h" #include "llfloaterhardwaresettings.h" -#include "llfloatervoicedevicesettings.h" #include "llimfloater.h" #include "llkeyboard.h" #include "llmodaldialog.h" @@ -58,6 +57,7 @@ #include "llnotifications.h" #include "llnotificationsutil.h" #include "llpanellogin.h" +#include "llpanelvoicedevicesettings.h" #include "llradiogroup.h" #include "llsearchcombobox.h" #include "llsky.h" @@ -407,12 +407,6 @@ void LLFloaterPreference::apply() hardware_settings->apply(); } - LLFloaterVoiceDeviceSettings* voice_device_settings = LLFloaterReg::findTypedInstance("pref_voicedevicesettings"); - if(voice_device_settings) - { - voice_device_settings->apply(); - } - gViewerWindow->requestResolutionUpdate(); // for UIScaleFactor LLSliderCtrl* fov_slider = getChild("camera_fov"); @@ -487,15 +481,6 @@ void LLFloaterPreference::cancel() // reverts any changes to current skin gSavedSettings.setString("SkinCurrent", sSkin); - - LLFloaterVoiceDeviceSettings* voice_device_settings = LLFloaterReg::findTypedInstance("pref_voicedevicesettings"); - if (voice_device_settings) - { - voice_device_settings ->cancel(); - } - - LLFloaterReg::hideInstance("pref_voicedevicesettings"); - } void LLFloaterPreference::onOpen(const LLSD& key) diff --git a/indra/newview/llfloatervoicedevicesettings.cpp b/indra/newview/llfloatervoicedevicesettings.cpp deleted file mode 100644 index 34277001ee..0000000000 --- a/indra/newview/llfloatervoicedevicesettings.cpp +++ /dev/null @@ -1,393 +0,0 @@ -/** - * @file llfloatervoicedevicesettings.cpp - * @author Richard Nelson - * @brief Voice communication set-up - * - * $LicenseInfo:firstyear=2007&license=viewerlgpl$ - * Second Life Viewer Source Code - * Copyright (C) 2010, Linden Research, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; - * version 2.1 of the License only. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA - * $/LicenseInfo$ - */ - -#include "llviewerprecompiledheaders.h" - -#include "llfloatervoicedevicesettings.h" - -// Viewer includes -#include "llbutton.h" -#include "llcombobox.h" -#include "llfocusmgr.h" -#include "lliconctrl.h" -#include "llsliderctrl.h" -#include "llviewercontrol.h" -#include "llvoiceclient.h" -#include "llvoicechannel.h" - -// Library includes (after viewer) -#include "lluictrlfactory.h" - - -static LLRegisterPanelClassWrapper t_panel_group_general("panel_voice_device_settings"); - - -LLPanelVoiceDeviceSettings::LLPanelVoiceDeviceSettings() - : LLPanel() -{ - mCtrlInputDevices = NULL; - mCtrlOutputDevices = NULL; - mInputDevice = gSavedSettings.getString("VoiceInputAudioDevice"); - mOutputDevice = gSavedSettings.getString("VoiceOutputAudioDevice"); - mDevicesUpdated = FALSE; - - // grab "live" mic volume level - mMicVolume = gSavedSettings.getF32("AudioLevelMic"); - -} - -LLPanelVoiceDeviceSettings::~LLPanelVoiceDeviceSettings() -{ -} - -BOOL LLPanelVoiceDeviceSettings::postBuild() -{ - LLSlider* volume_slider = getChild("mic_volume_slider"); - // set mic volume tuning slider based on last mic volume setting - volume_slider->setValue(mMicVolume); - - childSetCommitCallback("voice_input_device", onCommitInputDevice, this); - childSetCommitCallback("voice_output_device", onCommitOutputDevice, this); - - return TRUE; -} - -// virtual -void LLPanelVoiceDeviceSettings::handleVisibilityChange ( BOOL new_visibility ) -{ - if (new_visibility) - { - initialize(); - } - else - { - cleanup(); - // when closing this window, turn of visiblity control so that - // next time preferences is opened we don't suspend voice - gSavedSettings.setBOOL("ShowDeviceSettings", FALSE); - } -} -void LLPanelVoiceDeviceSettings::draw() -{ - refresh(); - - // let user know that volume indicator is not yet available - bool is_in_tuning_mode = LLVoiceClient::getInstance()->inTuningMode(); - getChildView("wait_text")->setVisible( !is_in_tuning_mode); - - LLPanel::draw(); - - if (is_in_tuning_mode) - { - const S32 num_bars = 5; - F32 voice_power = LLVoiceClient::getInstance()->tuningGetEnergy() / LLVoiceClient::OVERDRIVEN_POWER_LEVEL; - S32 discrete_power = llmin(num_bars, llfloor(voice_power * (F32)num_bars + 0.1f)); - - for(S32 power_bar_idx = 0; power_bar_idx < num_bars; power_bar_idx++) - { - std::string view_name = llformat("%s%d", "bar", power_bar_idx); - LLView* bar_view = getChild(view_name); - if (bar_view) - { - gl_rect_2d(bar_view->getRect(), LLColor4::grey, TRUE); - - LLColor4 color; - if (power_bar_idx < discrete_power) - { - color = (power_bar_idx >= 3) ? LLUIColorTable::instance().getColor("OverdrivenColor") : LLUIColorTable::instance().getColor("SpeakingColor"); - } - else - { - color = LLUIColorTable::instance().getColor("PanelFocusBackgroundColor"); - } - - LLRect color_rect = bar_view->getRect(); - color_rect.stretch(-1); - gl_rect_2d(color_rect, color, TRUE); - } - } - } -} - -void LLPanelVoiceDeviceSettings::apply() -{ - std::string s; - if(mCtrlInputDevices) - { - s = mCtrlInputDevices->getSimple(); - gSavedSettings.setString("VoiceInputAudioDevice", s); - mInputDevice = s; - } - - if(mCtrlOutputDevices) - { - s = mCtrlOutputDevices->getSimple(); - gSavedSettings.setString("VoiceOutputAudioDevice", s); - mOutputDevice = s; - } - - // assume we are being destroyed by closing our embedding window - LLSlider* volume_slider = getChild("mic_volume_slider"); - if(volume_slider) - { - F32 slider_value = (F32)volume_slider->getValue().asReal(); - gSavedSettings.setF32("AudioLevelMic", slider_value); - mMicVolume = slider_value; - } -} - -void LLPanelVoiceDeviceSettings::cancel() -{ - gSavedSettings.setString("VoiceInputAudioDevice", mInputDevice); - gSavedSettings.setString("VoiceOutputAudioDevice", mOutputDevice); - - if(mCtrlInputDevices) - mCtrlInputDevices->setSimple(mInputDevice); - - if(mCtrlOutputDevices) - mCtrlOutputDevices->setSimple(mOutputDevice); - - gSavedSettings.setF32("AudioLevelMic", mMicVolume); - LLSlider* volume_slider = getChild("mic_volume_slider"); - if(volume_slider) - { - volume_slider->setValue(mMicVolume); - } -} - -void LLPanelVoiceDeviceSettings::refresh() -{ - //grab current volume - LLSlider* volume_slider = getChild("mic_volume_slider"); - // set mic volume tuning slider based on last mic volume setting - F32 current_volume = (F32)volume_slider->getValue().asReal(); - LLVoiceClient::getInstance()->tuningSetMicVolume(current_volume); - - // Fill in popup menus - mCtrlInputDevices = getChild("voice_input_device"); - mCtrlOutputDevices = getChild("voice_output_device"); - - if(!LLVoiceClient::getInstance()->deviceSettingsAvailable()) - { - // The combo boxes are disabled, since we can't get the device settings from the daemon just now. - // Put the currently set default (ONLY) in the box, and select it. - if(mCtrlInputDevices) - { - mCtrlInputDevices->removeall(); - mCtrlInputDevices->add( mInputDevice, ADD_BOTTOM ); - mCtrlInputDevices->setSimple(mInputDevice); - } - if(mCtrlOutputDevices) - { - mCtrlOutputDevices->removeall(); - mCtrlOutputDevices->add( mOutputDevice, ADD_BOTTOM ); - mCtrlOutputDevices->setSimple(mOutputDevice); - } - } - else if (!mDevicesUpdated) - { - LLVoiceDeviceList::const_iterator iter; - - if(mCtrlInputDevices) - { - mCtrlInputDevices->removeall(); - mCtrlInputDevices->add( getString("default_text"), ADD_BOTTOM ); - - for(iter=LLVoiceClient::getInstance()->getCaptureDevices().begin(); - iter != LLVoiceClient::getInstance()->getCaptureDevices().end(); - iter++) - { - // Lets try to localize some system device names. EXT-8375 - std::string device_name = *iter; - LLStringUtil::toLower(device_name); //compare in low case - if ("default system device" == device_name) - { - device_name = getString(device_name); - } - else if ("no device" == device_name) - { - device_name = getString(device_name); - } - else - { - // restore original value - device_name = *iter; - } - mCtrlInputDevices->add(device_name, ADD_BOTTOM ); - } - - if(!mCtrlInputDevices->setSimple(mInputDevice)) - { - mCtrlInputDevices->setSimple(getString("default_text")); - } - } - - if(mCtrlOutputDevices) - { - mCtrlOutputDevices->removeall(); - mCtrlOutputDevices->add( getString("default_text"), ADD_BOTTOM ); - - for(iter= LLVoiceClient::getInstance()->getRenderDevices().begin(); - iter != LLVoiceClient::getInstance()->getRenderDevices().end(); iter++) - { - // Lets try to localize some system device names. EXT-8375 - std::string device_name = *iter; - LLStringUtil::toLower(device_name); //compare in low case - if ("default system device" == device_name) - { - device_name = getString(device_name); - } - else if ("no device" == device_name) - { - device_name = getString(device_name); - } - else - { - // restore original value - device_name = *iter; - } - mCtrlOutputDevices->add(device_name, ADD_BOTTOM ); - } - - if(!mCtrlOutputDevices->setSimple(mOutputDevice)) - { - mCtrlOutputDevices->setSimple(getString("default_text")); - } - } - mDevicesUpdated = TRUE; - } -} - -void LLPanelVoiceDeviceSettings::initialize() -{ - mInputDevice = gSavedSettings.getString("VoiceInputAudioDevice"); - mOutputDevice = gSavedSettings.getString("VoiceOutputAudioDevice"); - mMicVolume = gSavedSettings.getF32("AudioLevelMic"); - mDevicesUpdated = FALSE; - - // ask for new device enumeration - LLVoiceClient::getInstance()->refreshDeviceLists(); - - // put voice client in "tuning" mode - LLVoiceClient::getInstance()->tuningStart(); - LLVoiceChannel::suspend(); -} - -void LLPanelVoiceDeviceSettings::cleanup() -{ - LLVoiceClient::getInstance()->tuningStop(); - LLVoiceChannel::resume(); -} - -// static -void LLPanelVoiceDeviceSettings::onCommitInputDevice(LLUICtrl* ctrl, void* user_data) -{ - if(LLVoiceClient::getInstance()) - { - LLVoiceClient::getInstance()->setCaptureDevice(ctrl->getValue().asString()); - } -} - -// static -void LLPanelVoiceDeviceSettings::onCommitOutputDevice(LLUICtrl* ctrl, void* user_data) -{ - if(LLVoiceClient::getInstance()) - { - LLVoiceClient::getInstance()->setRenderDevice(ctrl->getValue().asString()); - } -} - -// -// LLFloaterVoiceDeviceSettings -// - -LLFloaterVoiceDeviceSettings::LLFloaterVoiceDeviceSettings(const LLSD& seed) - : LLFloater(seed), - mDevicePanel(NULL) -{ - mFactoryMap["device_settings"] = LLCallbackMap(createPanelVoiceDeviceSettings, this); - // do not automatically open singleton floaters (as result of getInstance()) -// BOOL no_open = FALSE; -// Called from floater reg: LLUICtrlFactory::getInstance()->buildFloater(this, "floater_device_settings.xml", no_open); -} -BOOL LLFloaterVoiceDeviceSettings::postBuild() -{ - center(); - return TRUE; -} - -// virtual -void LLFloaterVoiceDeviceSettings::onOpen(const LLSD& key) -{ - if(mDevicePanel) - { - mDevicePanel->initialize(); - } -} - -// virtual -void LLFloaterVoiceDeviceSettings::onClose(bool app_settings) -{ - if(mDevicePanel) - { - mDevicePanel->apply(); - mDevicePanel->cleanup(); - } -} - -void LLFloaterVoiceDeviceSettings::apply() -{ - if (mDevicePanel) - { - mDevicePanel->apply(); - } -} - -void LLFloaterVoiceDeviceSettings::cancel() -{ - if (mDevicePanel) - { - mDevicePanel->cancel(); - } -} - -void LLFloaterVoiceDeviceSettings::draw() -{ - if (mDevicePanel) - { - mDevicePanel->refresh(); - } - LLFloater::draw(); -} - -// static -void* LLFloaterVoiceDeviceSettings::createPanelVoiceDeviceSettings(void* user_data) -{ - LLFloaterVoiceDeviceSettings* floaterp = (LLFloaterVoiceDeviceSettings*)user_data; - floaterp->mDevicePanel = new LLPanelVoiceDeviceSettings(); - return floaterp->mDevicePanel; -} diff --git a/indra/newview/llfloatervoicedevicesettings.h b/indra/newview/llfloatervoicedevicesettings.h deleted file mode 100644 index 5f892972de..0000000000 --- a/indra/newview/llfloatervoicedevicesettings.h +++ /dev/null @@ -1,83 +0,0 @@ -/** - * @file llpanelvoicedevicesettings.h - * @author Richard Nelson - * @brief Voice communication set-up wizard - * - * $LicenseInfo:firstyear=2001&license=viewerlgpl$ - * Second Life Viewer Source Code - * Copyright (C) 2010, Linden Research, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; - * version 2.1 of the License only. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA - * $/LicenseInfo$ - */ - -#ifndef LL_LLFLOATERVOICEDEVICESETTINGS_H -#define LL_LLFLOATERVOICEDEVICESETTINGS_H - -#include "llfloater.h" - -class LLPanelVoiceDeviceSettings : public LLPanel -{ -public: - LLPanelVoiceDeviceSettings(); - ~LLPanelVoiceDeviceSettings(); - - /*virtual*/ void draw(); - /*virtual*/ BOOL postBuild(); - void apply(); - void cancel(); - void refresh(); - void initialize(); - void cleanup(); - - /*virtual*/ void handleVisibilityChange ( BOOL new_visibility ); - -protected: - static void onCommitInputDevice(LLUICtrl* ctrl, void* user_data); - static void onCommitOutputDevice(LLUICtrl* ctrl, void* user_data); - - F32 mMicVolume; - std::string mInputDevice; - std::string mOutputDevice; - class LLComboBox *mCtrlInputDevices; - class LLComboBox *mCtrlOutputDevices; - BOOL mDevicesUpdated; -}; - -class LLFloaterVoiceDeviceSettings : public LLFloater -{ - friend class LLFloaterReg; - -public: - - /*virtual*/ BOOL postBuild(); - /*virtual*/ void onOpen(const LLSD& key); - /*virtual*/ void onClose(bool app_settings); - /*virtual*/ void draw(); - void apply(); - void cancel(); -private: - LLFloaterVoiceDeviceSettings(const LLSD& seed); - -protected: - static void* createPanelVoiceDeviceSettings(void* user_data); - -protected: - LLPanelVoiceDeviceSettings* mDevicePanel; -}; - -#endif // LL_LLFLOATERVOICEDEVICESETTINGS_H diff --git a/indra/newview/llmorphview.h b/indra/newview/llmorphview.h index d135659ba2..1d8ee8e944 100644 --- a/indra/newview/llmorphview.h +++ b/indra/newview/llmorphview.h @@ -32,7 +32,6 @@ #include "llframetimer.h" class LLJoint; -class LLFloaterCustomize; class LLMorphView : public LLView { diff --git a/indra/newview/llpaneloutfitsinventory.cpp b/indra/newview/llpaneloutfitsinventory.cpp index c6a7bd88a0..ff59f9fa1e 100644 --- a/indra/newview/llpaneloutfitsinventory.cpp +++ b/indra/newview/llpaneloutfitsinventory.cpp @@ -217,15 +217,6 @@ void LLPanelOutfitsInventory::onSave() //payload["ids"].append(*it); LLNotificationsUtil::add("SaveOutfitAs", args, payload, boost::bind(&LLPanelOutfitsInventory::onSaveCommit, this, _1, _2)); - - //) - -/* - LLOutfitSaveAsDialog* save_as_dialog = LLFloaterReg::showTypedInstance("outfit_save_as", LLSD(outfit_name), TRUE); - if (save_as_dialog) - { - save_as_dialog->setSaveAsCommit(boost::bind(&LLPanelOutfitsInventory::onSaveCommit, this, _1 )); - }*/ } //static diff --git a/indra/newview/llpanelvoicedevicesettings.cpp b/indra/newview/llpanelvoicedevicesettings.cpp new file mode 100644 index 0000000000..a97fb434ae --- /dev/null +++ b/indra/newview/llpanelvoicedevicesettings.cpp @@ -0,0 +1,322 @@ +/** + * @file llpanelvoicedevicesettings.cpp + * @author Richard Nelson + * @brief Voice communication set-up + * + * $LicenseInfo:firstyear=2007&license=viewerlgpl$ + * Second Life Viewer Source Code + * Copyright (C) 2010, Linden Research, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; + * version 2.1 of the License only. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA + * $/LicenseInfo$ + */ + +#include "llviewerprecompiledheaders.h" + +#include "llpanelvoicedevicesettings.h" + +// Viewer includes +#include "llbutton.h" +#include "llcombobox.h" +#include "llfocusmgr.h" +#include "lliconctrl.h" +#include "llsliderctrl.h" +#include "llviewercontrol.h" +#include "llvoiceclient.h" +#include "llvoicechannel.h" + +// Library includes (after viewer) +#include "lluictrlfactory.h" + + +static LLRegisterPanelClassWrapper t_panel_group_general("panel_voice_device_settings"); + + +LLPanelVoiceDeviceSettings::LLPanelVoiceDeviceSettings() + : LLPanel() +{ + mCtrlInputDevices = NULL; + mCtrlOutputDevices = NULL; + mInputDevice = gSavedSettings.getString("VoiceInputAudioDevice"); + mOutputDevice = gSavedSettings.getString("VoiceOutputAudioDevice"); + mDevicesUpdated = FALSE; + + // grab "live" mic volume level + mMicVolume = gSavedSettings.getF32("AudioLevelMic"); + +} + +LLPanelVoiceDeviceSettings::~LLPanelVoiceDeviceSettings() +{ +} + +BOOL LLPanelVoiceDeviceSettings::postBuild() +{ + LLSlider* volume_slider = getChild("mic_volume_slider"); + // set mic volume tuning slider based on last mic volume setting + volume_slider->setValue(mMicVolume); + + childSetCommitCallback("voice_input_device", onCommitInputDevice, this); + childSetCommitCallback("voice_output_device", onCommitOutputDevice, this); + + return TRUE; +} + +// virtual +void LLPanelVoiceDeviceSettings::handleVisibilityChange ( BOOL new_visibility ) +{ + if (new_visibility) + { + initialize(); + } + else + { + cleanup(); + // when closing this window, turn of visiblity control so that + // next time preferences is opened we don't suspend voice + gSavedSettings.setBOOL("ShowDeviceSettings", FALSE); + } +} +void LLPanelVoiceDeviceSettings::draw() +{ + refresh(); + + // let user know that volume indicator is not yet available + bool is_in_tuning_mode = LLVoiceClient::getInstance()->inTuningMode(); + getChildView("wait_text")->setVisible( !is_in_tuning_mode); + + LLPanel::draw(); + + if (is_in_tuning_mode) + { + const S32 num_bars = 5; + F32 voice_power = LLVoiceClient::getInstance()->tuningGetEnergy() / LLVoiceClient::OVERDRIVEN_POWER_LEVEL; + S32 discrete_power = llmin(num_bars, llfloor(voice_power * (F32)num_bars + 0.1f)); + + for(S32 power_bar_idx = 0; power_bar_idx < num_bars; power_bar_idx++) + { + std::string view_name = llformat("%s%d", "bar", power_bar_idx); + LLView* bar_view = getChild(view_name); + if (bar_view) + { + gl_rect_2d(bar_view->getRect(), LLColor4::grey, TRUE); + + LLColor4 color; + if (power_bar_idx < discrete_power) + { + color = (power_bar_idx >= 3) ? LLUIColorTable::instance().getColor("OverdrivenColor") : LLUIColorTable::instance().getColor("SpeakingColor"); + } + else + { + color = LLUIColorTable::instance().getColor("PanelFocusBackgroundColor"); + } + + LLRect color_rect = bar_view->getRect(); + color_rect.stretch(-1); + gl_rect_2d(color_rect, color, TRUE); + } + } + } +} + +void LLPanelVoiceDeviceSettings::apply() +{ + std::string s; + if(mCtrlInputDevices) + { + s = mCtrlInputDevices->getSimple(); + gSavedSettings.setString("VoiceInputAudioDevice", s); + mInputDevice = s; + } + + if(mCtrlOutputDevices) + { + s = mCtrlOutputDevices->getSimple(); + gSavedSettings.setString("VoiceOutputAudioDevice", s); + mOutputDevice = s; + } + + // assume we are being destroyed by closing our embedding window + LLSlider* volume_slider = getChild("mic_volume_slider"); + if(volume_slider) + { + F32 slider_value = (F32)volume_slider->getValue().asReal(); + gSavedSettings.setF32("AudioLevelMic", slider_value); + mMicVolume = slider_value; + } +} + +void LLPanelVoiceDeviceSettings::cancel() +{ + gSavedSettings.setString("VoiceInputAudioDevice", mInputDevice); + gSavedSettings.setString("VoiceOutputAudioDevice", mOutputDevice); + + if(mCtrlInputDevices) + mCtrlInputDevices->setSimple(mInputDevice); + + if(mCtrlOutputDevices) + mCtrlOutputDevices->setSimple(mOutputDevice); + + gSavedSettings.setF32("AudioLevelMic", mMicVolume); + LLSlider* volume_slider = getChild("mic_volume_slider"); + if(volume_slider) + { + volume_slider->setValue(mMicVolume); + } +} + +void LLPanelVoiceDeviceSettings::refresh() +{ + //grab current volume + LLSlider* volume_slider = getChild("mic_volume_slider"); + // set mic volume tuning slider based on last mic volume setting + F32 current_volume = (F32)volume_slider->getValue().asReal(); + LLVoiceClient::getInstance()->tuningSetMicVolume(current_volume); + + // Fill in popup menus + mCtrlInputDevices = getChild("voice_input_device"); + mCtrlOutputDevices = getChild("voice_output_device"); + + if(!LLVoiceClient::getInstance()->deviceSettingsAvailable()) + { + // The combo boxes are disabled, since we can't get the device settings from the daemon just now. + // Put the currently set default (ONLY) in the box, and select it. + if(mCtrlInputDevices) + { + mCtrlInputDevices->removeall(); + mCtrlInputDevices->add( mInputDevice, ADD_BOTTOM ); + mCtrlInputDevices->setSimple(mInputDevice); + } + if(mCtrlOutputDevices) + { + mCtrlOutputDevices->removeall(); + mCtrlOutputDevices->add( mOutputDevice, ADD_BOTTOM ); + mCtrlOutputDevices->setSimple(mOutputDevice); + } + } + else if (!mDevicesUpdated) + { + LLVoiceDeviceList::const_iterator iter; + + if(mCtrlInputDevices) + { + mCtrlInputDevices->removeall(); + mCtrlInputDevices->add( getString("default_text"), ADD_BOTTOM ); + + for(iter=LLVoiceClient::getInstance()->getCaptureDevices().begin(); + iter != LLVoiceClient::getInstance()->getCaptureDevices().end(); + iter++) + { + // Lets try to localize some system device names. EXT-8375 + std::string device_name = *iter; + LLStringUtil::toLower(device_name); //compare in low case + if ("default system device" == device_name) + { + device_name = getString(device_name); + } + else if ("no device" == device_name) + { + device_name = getString(device_name); + } + else + { + // restore original value + device_name = *iter; + } + mCtrlInputDevices->add(device_name, ADD_BOTTOM ); + } + + if(!mCtrlInputDevices->setSimple(mInputDevice)) + { + mCtrlInputDevices->setSimple(getString("default_text")); + } + } + + if(mCtrlOutputDevices) + { + mCtrlOutputDevices->removeall(); + mCtrlOutputDevices->add( getString("default_text"), ADD_BOTTOM ); + + for(iter= LLVoiceClient::getInstance()->getRenderDevices().begin(); + iter != LLVoiceClient::getInstance()->getRenderDevices().end(); iter++) + { + // Lets try to localize some system device names. EXT-8375 + std::string device_name = *iter; + LLStringUtil::toLower(device_name); //compare in low case + if ("default system device" == device_name) + { + device_name = getString(device_name); + } + else if ("no device" == device_name) + { + device_name = getString(device_name); + } + else + { + // restore original value + device_name = *iter; + } + mCtrlOutputDevices->add(device_name, ADD_BOTTOM ); + } + + if(!mCtrlOutputDevices->setSimple(mOutputDevice)) + { + mCtrlOutputDevices->setSimple(getString("default_text")); + } + } + mDevicesUpdated = TRUE; + } +} + +void LLPanelVoiceDeviceSettings::initialize() +{ + mInputDevice = gSavedSettings.getString("VoiceInputAudioDevice"); + mOutputDevice = gSavedSettings.getString("VoiceOutputAudioDevice"); + mMicVolume = gSavedSettings.getF32("AudioLevelMic"); + mDevicesUpdated = FALSE; + + // ask for new device enumeration + LLVoiceClient::getInstance()->refreshDeviceLists(); + + // put voice client in "tuning" mode + LLVoiceClient::getInstance()->tuningStart(); + LLVoiceChannel::suspend(); +} + +void LLPanelVoiceDeviceSettings::cleanup() +{ + LLVoiceClient::getInstance()->tuningStop(); + LLVoiceChannel::resume(); +} + +// static +void LLPanelVoiceDeviceSettings::onCommitInputDevice(LLUICtrl* ctrl, void* user_data) +{ + if(LLVoiceClient::getInstance()) + { + LLVoiceClient::getInstance()->setCaptureDevice(ctrl->getValue().asString()); + } +} + +// static +void LLPanelVoiceDeviceSettings::onCommitOutputDevice(LLUICtrl* ctrl, void* user_data) +{ + if(LLVoiceClient::getInstance()) + { + LLVoiceClient::getInstance()->setRenderDevice(ctrl->getValue().asString()); + } +} diff --git a/indra/newview/llpanelvoicedevicesettings.h b/indra/newview/llpanelvoicedevicesettings.h new file mode 100644 index 0000000000..dd630be9a3 --- /dev/null +++ b/indra/newview/llpanelvoicedevicesettings.h @@ -0,0 +1,61 @@ +/** + * @file llpanelvoicedevicesettings.h + * @author Richard Nelson + * @brief Voice communication set-up wizard + * + * $LicenseInfo:firstyear=2001&license=viewerlgpl$ + * Second Life Viewer Source Code + * Copyright (C) 2010, Linden Research, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; + * version 2.1 of the License only. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA + * $/LicenseInfo$ + */ + +#ifndef LL_LLFLOATERVOICEDEVICESETTINGS_H +#define LL_LLFLOATERVOICEDEVICESETTINGS_H + +#include "llfloater.h" + +class LLPanelVoiceDeviceSettings : public LLPanel +{ +public: + LLPanelVoiceDeviceSettings(); + ~LLPanelVoiceDeviceSettings(); + + /*virtual*/ void draw(); + /*virtual*/ BOOL postBuild(); + void apply(); + void cancel(); + void refresh(); + void initialize(); + void cleanup(); + + /*virtual*/ void handleVisibilityChange ( BOOL new_visibility ); + +protected: + static void onCommitInputDevice(LLUICtrl* ctrl, void* user_data); + static void onCommitOutputDevice(LLUICtrl* ctrl, void* user_data); + + F32 mMicVolume; + std::string mInputDevice; + std::string mOutputDevice; + class LLComboBox *mCtrlInputDevices; + class LLComboBox *mCtrlOutputDevices; + BOOL mDevicesUpdated; +}; + +#endif // LL_LLFLOATERVOICEDEVICESETTINGS_H 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"); diff --git a/indra/newview/skins/default/xui/da/floater_customize.xml b/indra/newview/skins/default/xui/da/floater_customize.xml deleted file mode 100644 index a47e0d33df..0000000000 --- a/indra/newview/skins/default/xui/da/floater_customize.xml +++ /dev/null @@ -1,530 +0,0 @@ - - - - - Kropsdele - - - - - diff --git a/indra/newview/skins/default/xui/es/floater_customize.xml b/indra/newview/skins/default/xui/es/floater_customize.xml deleted file mode 100644 index 77b670d5f0..0000000000 --- a/indra/newview/skins/default/xui/es/floater_customize.xml +++ /dev/null @@ -1,530 +0,0 @@ - - - - - Partes del cuerpo - - -