8a2c295298
# Conflicts: # indra/newview/llfloaterpreference.cpp # indra/newview/skins/default/xui/en/panel_preferences_move.xml # indra/newview/skins/default/xui/ja/floater_360capture.xml # indra/newview/skins/default/xui/ja/floater_about_land.xml # indra/newview/skins/default/xui/ja/floater_edit_ext_day_cycle.xml # indra/newview/skins/default/xui/ja/floater_god_tools.xml # indra/newview/skins/default/xui/ja/floater_inspect.xml # indra/newview/skins/default/xui/ja/floater_joystick.xml # indra/newview/skins/default/xui/ja/floater_land_holdings.xml # indra/newview/skins/default/xui/ja/floater_lsl_guide.xml # indra/newview/skins/default/xui/ja/floater_model_preview.xml # indra/newview/skins/default/xui/ja/floater_pathfinding_console.xml # indra/newview/skins/default/xui/ja/floater_pathfinding_linksets.xml # indra/newview/skins/default/xui/ja/floater_preferences.xml # indra/newview/skins/default/xui/ja/floater_preferences_graphics_advanced.xml # indra/newview/skins/default/xui/ja/floater_preferences_view_advanced.xml # indra/newview/skins/default/xui/ja/floater_scene_load_stats.xml # indra/newview/skins/default/xui/ja/floater_settings_debug.xml # indra/newview/skins/default/xui/ja/floater_snapshot.xml # indra/newview/skins/default/xui/ja/floater_stats.xml # indra/newview/skins/default/xui/ja/floater_tools.xml # indra/newview/skins/default/xui/ja/floater_top_objects.xml # indra/newview/skins/default/xui/ja/floater_ui_preview.xml # indra/newview/skins/default/xui/ja/menu_attachment_other.xml # indra/newview/skins/default/xui/ja/menu_avatar_other.xml # indra/newview/skins/default/xui/ja/menu_conversation_log_view.xml # indra/newview/skins/default/xui/ja/menu_gesture_gear.xml # indra/newview/skins/default/xui/ja/menu_inventory.xml # indra/newview/skins/default/xui/ja/menu_participant_list.xml # indra/newview/skins/default/xui/ja/menu_people_nearby_multiselect.xml # indra/newview/skins/default/xui/ja/menu_profile_other.xml # indra/newview/skins/default/xui/ja/menu_profile_self.xml # indra/newview/skins/default/xui/ja/menu_settings_gear.xml # indra/newview/skins/default/xui/ja/menu_url_agent.xml # indra/newview/skins/default/xui/ja/menu_viewer.xml # indra/newview/skins/default/xui/ja/menu_wearable_list_item.xml # indra/newview/skins/default/xui/ja/notifications.xml # indra/newview/skins/default/xui/ja/panel_avatar_list_item.xml # indra/newview/skins/default/xui/ja/panel_clothing_list_button_bar.xml # indra/newview/skins/default/xui/ja/panel_edit_universal.xml # indra/newview/skins/default/xui/ja/panel_group_bulk_ban.xml # indra/newview/skins/default/xui/ja/panel_group_creation_sidetray.xml # indra/newview/skins/default/xui/ja/panel_group_notices.xml # indra/newview/skins/default/xui/ja/panel_landmark_info.xml # indra/newview/skins/default/xui/ja/panel_main_inventory.xml # indra/newview/skins/default/xui/ja/panel_nearby_chat_bar.xml # indra/newview/skins/default/xui/ja/panel_nearby_media.xml # indra/newview/skins/default/xui/ja/panel_people.xml # indra/newview/skins/default/xui/ja/panel_performance_autoadjustments.xml # indra/newview/skins/default/xui/ja/panel_performance_preferences.xml # indra/newview/skins/default/xui/ja/panel_place_profile.xml # indra/newview/skins/default/xui/ja/panel_postcard_settings.xml # indra/newview/skins/default/xui/ja/panel_preferences_advanced.xml # indra/newview/skins/default/xui/ja/panel_preferences_chat.xml # indra/newview/skins/default/xui/ja/panel_preferences_colors.xml # indra/newview/skins/default/xui/ja/panel_preferences_general.xml # indra/newview/skins/default/xui/ja/panel_preferences_graphics1.xml # indra/newview/skins/default/xui/ja/panel_preferences_sound.xml # indra/newview/skins/default/xui/ja/panel_presets_pulldown.xml # indra/newview/skins/default/xui/ja/panel_prim_media_controls.xml # indra/newview/skins/default/xui/ja/panel_profile_secondlife.xml # indra/newview/skins/default/xui/ja/panel_region_environment.xml # indra/newview/skins/default/xui/ja/panel_region_estate.xml # indra/newview/skins/default/xui/ja/panel_region_terrain.xml # indra/newview/skins/default/xui/ja/panel_status_bar.xml # indra/newview/skins/default/xui/ja/panel_tools_texture.xml # indra/newview/skins/default/xui/ja/sidepanel_item_info.xml # indra/newview/skins/default/xui/ja/sidepanel_task_info.xml # indra/newview/skins/default/xui/ja/strings.xml # indra/newview/skins/default/xui/ja/teleport_strings.xml |
||
|---|---|---|
| .. | ||
| cmake | ||
| copy_win_scripts | ||
| doxygen | ||
| integration_tests | ||
| lib/python/indra | ||
| linux_crash_logger | ||
| llappearance | ||
| llaudio | ||
| llcharacter | ||
| llcommon | ||
| llconvexdecomposition | ||
| llcorehttp | ||
| llcrashlogger | ||
| llfilesystem | ||
| llimage | ||
| llimagej2coj | ||
| llinventory | ||
| llkdu | ||
| llmath | ||
| llmeshoptimizer | ||
| llmessage | ||
| llplugin | ||
| llprimitive | ||
| llrender | ||
| llui | ||
| llwebrtc | ||
| llwindow | ||
| llxml | ||
| mac_crash_logger | ||
| media_plugins | ||
| newview | ||
| test | ||
| tools/manifests | ||
| viewer_components | ||
| win_crash_logger | ||
| CMakeLists.txt | ||
| Version | ||