f08bf0aa72
# Conflicts: # indra/newview/llspatialpartition.cpp # indra/newview/skins/default/xui/en/alert_icon.xml # indra/newview/skins/default/xui/en/floater_associate_listing.xml # indra/newview/skins/default/xui/en/floater_ban_duration.xml # indra/newview/skins/default/xui/en/floater_experiences.xml # indra/newview/skins/default/xui/en/floater_inventory_view_finder.xml # indra/newview/skins/default/xui/en/floater_live_lsleditor.xml # indra/newview/skins/default/xui/en/floater_mfa.xml # indra/newview/skins/default/xui/en/floater_mute_object.xml # indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml # indra/newview/skins/default/xui/en/floater_preview_animation.xml # indra/newview/skins/default/xui/en/floater_script_search.xml # indra/newview/skins/default/xui/en/floater_test_inspectors.xml # indra/newview/skins/default/xui/en/floater_test_line_editor.xml # indra/newview/skins/default/xui/en/floater_test_textbox.xml # indra/newview/skins/default/xui/en/floater_texture_fetch_debugger.xml # indra/newview/skins/default/xui/en/floater_web_content.xml # indra/newview/skins/default/xui/en/menu_profile_overflow.xml # indra/newview/skins/default/xui/en/menu_toolbars.xml # indra/newview/skins/default/xui/en/notifications.xml # indra/newview/skins/default/xui/en/panel_blocked_list_item.xml # indra/newview/skins/default/xui/en/panel_bottomtray_lite.xml # indra/newview/skins/default/xui/en/panel_edit_universal.xml # indra/newview/skins/default/xui/en/panel_group_creation_sidetray.xml # indra/newview/skins/default/xui/en/panel_navigation_bar.xml # indra/newview/skins/default/xui/en/panel_performance_complexity.xml # indra/newview/skins/default/xui/en/panel_performance_huds.xml # indra/newview/skins/default/xui/en/panel_performance_preferences.xml # indra/newview/skins/default/xui/en/panel_preferences_advanced.xml # indra/newview/skins/default/xui/en/panel_preferences_sound.xml # indra/newview/skins/default/xui/en/panel_stand_stop_flying.xml # indra/newview/skins/default/xui/en/panel_volume_pulldown.xml # indra/newview/skins/default/xui/en/widgets/menu_item_tear_off.xml # indra/newview/skins/default/xui/en/widgets/name_editor.xml # indra/newview/skins/default/xui/en/widgets/notification_list_view.xml # indra/newview/skins/default/xui/en/widgets/view_border.xml |
||
|---|---|---|
| .. | ||
| cmake | ||
| copy_win_scripts | ||
| doxygen | ||
| integration_tests | ||
| lib/python/indra | ||
| linux_crash_logger | ||
| llappearance | ||
| llaudio | ||
| llcharacter | ||
| llcommon | ||
| llcorehttp | ||
| llcrashlogger | ||
| llfilesystem | ||
| llimage | ||
| llimagej2coj | ||
| llinventory | ||
| llkdu | ||
| llmath | ||
| llmeshoptimizer | ||
| llmessage | ||
| llplugin | ||
| llprimitive | ||
| llrender | ||
| llui | ||
| llwindow | ||
| llxml | ||
| mac_crash_logger | ||
| media_plugins | ||
| newview | ||
| test | ||
| tools | ||
| viewer_components | ||
| win_crash_logger | ||
| CMakeLists.txt | ||
| Version | ||
| edit-me-to-trigger-new-build.txt | ||
| fix-incredibuild.py | ||