Commit Graph

198 Commits (210f59a9231f75863f450082c15ac717b20e5d08)

Author SHA1 Message Date
Ansariel 210f59a923 Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/llui/llfloater.cpp
#	indra/llui/llfloater.h
#	indra/llui/llfolderview.h
#	indra/llui/llfolderviewitem.cpp
#	indra/llui/llmenugl.cpp
#	indra/llui/llscrolllistctrl.cpp
#	indra/llui/llstatbar.cpp
#	indra/llui/lltabcontainer.h
#	indra/llwindow/lldxhardware.cpp
#	indra/llwindow/lldxhardware.h
#	indra/llwindow/llkeyboard.cpp
#	indra/llwindow/llkeyboard.h
#	indra/llwindow/llkeyboardheadless.cpp
#	indra/llwindow/llkeyboardheadless.h
#	indra/llwindow/llwindow.h
#	indra/llwindow/llwindowmacosx.cpp
#	indra/llwindow/llwindowmacosx.h
#	indra/llwindow/llwindowsdl.cpp
#	indra/llwindow/llwindowsdl.h
#	indra/llwindow/llwindowwin32.cpp
#	indra/llwindow/llwindowwin32.h
#	indra/newview/llavatarlist.cpp
#	indra/newview/llavatarlistitem.h
#	indra/newview/llchatitemscontainerctrl.cpp
#	indra/newview/llchiclet.cpp
#	indra/newview/llfasttimerview.cpp
#	indra/newview/llfavoritesbar.cpp
#	indra/newview/llfloaterbvhpreview.cpp
#	indra/newview/llfloatermap.cpp
#	indra/newview/llnavigationbar.cpp
#	indra/newview/llnavigationbar.h
#	indra/newview/llnetmap.cpp
#	indra/newview/lltexturectrl.cpp
#	indra/newview/lltoolcomp.cpp
#	indra/newview/lltoolcomp.h
#	indra/newview/lltoolface.cpp
#	indra/newview/lltoolfocus.h
#	indra/newview/lltoolpie.cpp
2024-02-18 16:22:54 +01:00
Ansariel c285f59ce2 Replace BOOL with bool in llwindow and dependent classes 2024-02-18 15:51:54 +02:00
Ansariel 9dc3651d0c Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/llappearance/lltexlayer.cpp
#	indra/llappearance/lltexlayer.h
#	indra/llappearance/lltexlayerparams.cpp
#	indra/llappearance/llwearabletype.cpp
#	indra/llcharacter/llbvhloader.cpp
#	indra/llcharacter/llbvhloader.h
#	indra/llcharacter/llcharacter.cpp
#	indra/llcharacter/llcharacter.h
#	indra/llcharacter/lljoint.h
#	indra/llcharacter/llvisualparam.cpp
#	indra/llfilesystem/lldir_win32.cpp
#	indra/llfilesystem/lldir_win32.h
#	indra/llinventory/llparcel.cpp
#	indra/llmath/llmath.h
#	indra/llmath/llvolume.cpp
#	indra/llmessage/lldatapacker.h
#	indra/llxml/llxmltree.h
#	indra/newview/CMakeLists.txt
#	indra/newview/llagentwearables.cpp
#	indra/newview/llagentwearables.h
#	indra/newview/lldirpicker.cpp
#	indra/newview/llphysicsmotion.cpp
#	indra/newview/llviewergesture.cpp
#	indra/newview/llviewerjointattachment.cpp
#	indra/newview/llviewermessage.cpp
#	indra/newview/llviewertexlayer.cpp
#	indra/newview/llviewertexlayer.h
#	indra/newview/llvoavatarself.cpp
#	indra/newview/llvoavatarself.h
2024-02-18 00:09:57 +01:00
Ansariel 9480a98cff Replace most of BOOL with bool in llmath 2024-02-16 10:17:55 +02:00
Ansariel a45c5826dc Merge branch 'DRTVWR-567' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llvovolume.cpp
2023-09-12 14:20:54 +02:00
Andrey Kleshchev 46425b2e49 SL-19826 Keep scroll from acting up if selection changed
Unfulfilled scroll (due to fetching) persisted after selection changed
2023-09-10 21:48:43 +03:00
Ansariel 147dc16bc5 Merge branch 'DRTVWR-567' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventorypanel.cpp
#	indra/newview/skins/default/xui/en/panel_main_inventory.xml
2023-06-19 11:17:10 +02:00
Andrey Kleshchev 7f6ad82a2a SL-19823 Additional logging 2023-06-12 23:53:10 +03:00
Ansariel 23cf219d4a Merge branch 'DRTVWR-567' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llinventoryfunctions.h
#	indra/newview/llinventorypanel.cpp
#	indra/newview/llpanelmaininventory.cpp
#	indra/newview/llpanelmaininventory.h
#	indra/newview/skins/default/xui/en/panel_main_inventory.xml
2023-06-12 18:46:25 +02:00
Maxim Nikolenko 9eabffe430 SL-19825 do not mix bool and BOOL types 2023-06-12 19:44:29 +03:00
Maxim Nikolenko 929f9d8d5f SL-19825 clear selection when right-clicking outside of selected items 2023-06-12 16:10:28 +03:00
Andrey Kleshchev 417dbeb68e SL-19823 Edit not always active #5 2023-06-10 01:33:43 +03:00
Andrey Kleshchev 07fc011e20 SL-19796 Creating folders in list mode does not scroll to new folder 2023-06-02 21:24:15 +03:00
Andrey Kleshchev 2331190310 Revert "SL-19795 Unified scroll" 2023-05-31 21:26:06 +03:00
Ansariel 6273fb827f Merge branch 'DRTVWR-567' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventorymodelbackgroundfetch.cpp
#	indra/newview/llinventorypanel.cpp
#	indra/newview/llpanelmaininventory.h
2023-05-31 12:02:06 +02:00
Maxim Nikolenko 5c55adae47 SL-19773 add context menu for root folder in single folder mode 2023-05-30 13:10:36 +03:00
Andrey Kleshchev 572e8269bc SL-19604 Creating new folders in combination views does not highlight created item 2023-05-25 02:18:50 +03:00
Maxim Nikolenko f83ed21832 SL-19752 don't try to scroll after opening the new folder in single-folder view to avoid crash 2023-05-22 20:47:17 +03:00
Andrey Kleshchev 706d8f1727 SL-19732 Fix folder's thumbnail from sticking over folder's content 2023-05-18 22:22:16 +03:00
Ansariel 3fed8d9fc4 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
# Conflicts:
#	doc/contributions.txt
#	indra/llcommon/llsdserialize.cpp
#	indra/llcommon/llsdserialize.h
#	indra/newview/llpathfindingnavmesh.cpp
2023-05-17 23:33:50 +02:00
Andrey Lihatskiy 53ed0ec70c Merge branch 'main' into DRTVWR-567
# Conflicts:
#	doc/contributions.txt
2023-05-17 23:57:11 +03:00
Ansariel 7bcb251661 Merge branch 'DRTVWR-567' of https://github.com/secondlife/viewer
# Conflicts:
#	autobuild.xml
#	indra/llmessage/llcoproceduremanager.cpp
#	indra/llui/lllayoutstack.h
#	indra/newview/llfloatersidepanelcontainer.h
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventoryfilter.cpp
#	indra/newview/llinventoryfilter.h
#	indra/newview/llinventorymodelbackgroundfetch.cpp
#	indra/newview/llinventorymodelbackgroundfetch.h
#	indra/newview/llinventorypanel.cpp
#	indra/newview/llpanelmaininventory.cpp
#	indra/newview/llpanelmaininventory.h
#	indra/newview/lltexturectrl.cpp
#	indra/newview/skins/default/xui/en/panel_main_inventory.xml
2023-04-21 12:08:40 +02:00
Maxim Nikolenko 37530c9d73 SL-19544 WIP hide inventory pane in Combination view, if there is no visible items 2023-04-12 21:11:36 +03:00
Maxim Nikolenko 5809238226 SL-19273 Show empty folder message for empty folders regardless of filter state 2023-04-04 16:38:53 +03:00
Ansariel 1772ae4c6c Merge branch 'DRTVWR-577-maint-S' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/newview/app_settings/settings.xml
#	indra/newview/llappviewerwin32.cpp
#	indra/newview/skins/default/xui/en/floater_about_land.xml
#	indra/newview/skins/default/xui/en/panel_preferences_chat.xml
2023-03-07 14:21:43 +01:00
Ansariel 6895025a35 Merge branch 'DRTVWR-567' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/llui/llfolderviewitem.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llinventorypanel.cpp
#	indra/newview/llpanelmaininventory.cpp
#	indra/newview/skins/default/xui/en/floater_my_inventory.xml
#	indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
#	indra/newview/skins/default/xui/en/menu_viewer.xml
#	indra/newview/skins/default/xui/en/panel_main_inventory.xml
2023-03-06 15:23:21 +01:00
Maxim Nikolenko c74658b19b SL-19310 Update navigation buttons in single-folder view 2023-03-02 20:54:33 +02:00
Andrey Kleshchev 375d01e17a SL-18735 Fix scroll not following item for long enough 2023-02-17 02:31:35 +02:00
Ansariel 2bc4fb2bf0 Merge branch 'DRTVWR-567' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/llcommon/llqueuedthread.cpp
#	indra/llcommon/llsdserialize.cpp
#	indra/llcommon/llsdserialize.h
#	indra/llcommon/llthreadsafequeue.h
#	indra/llinventory/llsettingssky.cpp
#	indra/llui/llfolderviewitem.cpp
#	indra/llui/llview.h
#	indra/newview/llaisapi.cpp
#	indra/newview/llappviewer.cpp
#	indra/newview/llfloaterproperties.cpp
#	indra/newview/llfloaterproperties.h
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llinventorypanel.cpp
#	indra/newview/llpanelmaininventory.cpp
#	indra/newview/llpanelmaininventory.h
#	indra/newview/llpanelmarketplaceinbox.cpp
#	indra/newview/llpanelprofile.cpp
#	indra/newview/llpanelprofile.h
#	indra/newview/llpathfindingnavmesh.cpp
#	indra/newview/llselectmgr.cpp
#	indra/newview/llsidepanelinventory.cpp
#	indra/newview/llsidepanelinventory.h
#	indra/newview/llsidepaneliteminfo.cpp
#	indra/newview/llsidepaneltaskinfo.cpp
#	indra/newview/llviewerfloaterreg.cpp
#	indra/newview/skins/default/xui/da/floater_inventory_item_properties.xml
#	indra/newview/skins/default/xui/de/floater_inventory_item_properties.xml
#	indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml
#	indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml
#	indra/newview/skins/default/xui/en/panel_main_inventory.xml
#	indra/newview/skins/default/xui/en/panel_profile_firstlife.xml
#	indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
#	indra/newview/skins/default/xui/en/sidepanel_inventory.xml
#	indra/newview/skins/default/xui/en/sidepanel_item_info.xml
#	indra/newview/skins/default/xui/en/sidepanel_task_info.xml
#	indra/newview/skins/default/xui/es/floater_inventory_item_properties.xml
#	indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml
#	indra/newview/skins/default/xui/it/floater_inventory_item_properties.xml
#	indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml
#	indra/newview/skins/default/xui/pl/floater_inventory_item_properties.xml
#	indra/newview/skins/default/xui/ru/floater_inventory_item_properties.xml
2023-02-13 23:35:21 +01:00
Andrey Kleshchev 6c54c9f8a9 Merge branch 'main' into DRTVWR-577-maint-S
# Conflicts:
#	indra/llcommon/llsdserialize.cpp
#	indra/llcommon/llsdserialize.h
#	indra/newview/llfilepicker.h
#	indra/newview/llfilepicker_mac.h
#	indra/newview/llfilepicker_mac.mm
2023-02-09 22:33:52 +02:00
Ansariel fb727de6e3 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
# Conflicts:
#	indra/llcommon/llsdserialize.cpp
#	indra/llcommon/llsdserialize.h
#	indra/newview/llfilepicker.h
#	indra/newview/llfilepicker_mac.h
#	indra/newview/llfilepicker_mac.mm
#	indra/newview/llmeshrepository.cpp
2023-02-03 22:33:41 +01:00
Maxim Nikolenko 51142d1341 Merge branch 'main' into DRTVWR-567
# Conflicts:
#	indra/newview/llappearancemgr.cpp
#	indra/newview/llpanelmaininventory.cpp
2023-02-03 16:53:33 +02:00
Kitty Barnett 1140ae3489 Add a texture inspector and show it when hovering over an inventory textory (or folder containing - among others - exactly one texture) and when hovering over notecard embedded textures 2023-02-01 16:38:47 +02:00
Ansariel 6ae8248f5d Merge branch 'DRTVWR-577-maint-S' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/llinventory/llsettingssky.cpp
#	indra/llui/llfolderviewitem.h
#	indra/newview/llappviewer.cpp
#	indra/newview/skins/default/xui/de/floater_about_land.xml
#	indra/newview/skins/default/xui/de/floater_avatar_textures.xml
#	indra/newview/skins/default/xui/de/floater_camera.xml
#	indra/newview/skins/default/xui/de/floater_camera_presets.xml
#	indra/newview/skins/default/xui/de/floater_linkreplace.xml
#	indra/newview/skins/default/xui/de/floater_people.xml
#	indra/newview/skins/default/xui/de/floater_preferences_view_advanced.xml
#	indra/newview/skins/default/xui/de/floater_preview_trash.xml
#	indra/newview/skins/default/xui/de/floater_save_camera_preset.xml
#	indra/newview/skins/default/xui/de/menu_gallery_outfit_tab.xml
#	indra/newview/skins/default/xui/de/notifications.xml
#	indra/newview/skins/default/xui/de/panel_group_creation_sidetray.xml
#	indra/newview/skins/default/xui/de/panel_group_roles.xml
#	indra/newview/skins/default/xui/de/panel_login.xml
#	indra/newview/skins/default/xui/de/panel_notification_list_item.xml
#	indra/newview/skins/default/xui/de/panel_outfit_gallery.xml
#	indra/newview/skins/default/xui/de/panel_outfit_gallery_item.xml
#	indra/newview/skins/default/xui/de/panel_preferences_sound.xml
#	indra/newview/skins/default/xui/de/panel_progress.xml
#	indra/newview/skins/default/xui/de/panel_region_environment.xml
#	indra/newview/skins/default/xui/de/strings.xml
#	indra/newview/skins/default/xui/de/teleport_strings.xml
#	indra/newview/skins/default/xui/es/floater_animation_anim_preview.xml
#	indra/newview/skins/default/xui/es/floater_animation_bvh_preview.xml
#	indra/newview/skins/default/xui/es/floater_camera.xml
#	indra/newview/skins/default/xui/es/floater_god_tools.xml
#	indra/newview/skins/default/xui/es/floater_people.xml
#	indra/newview/skins/default/xui/es/floater_tools.xml
#	indra/newview/skins/default/xui/es/menu_viewer.xml
#	indra/newview/skins/default/xui/es/notifications.xml
#	indra/newview/skins/default/xui/es/panel_group_roles.xml
#	indra/newview/skins/default/xui/es/panel_landmark_info.xml
#	indra/newview/skins/default/xui/es/panel_login.xml
#	indra/newview/skins/default/xui/es/panel_preferences_sound.xml
#	indra/newview/skins/default/xui/es/panel_prim_media_controls.xml
#	indra/newview/skins/default/xui/es/strings.xml
#	indra/newview/skins/default/xui/es/teleport_strings.xml
#	indra/newview/skins/default/xui/fr/floater_avatar_textures.xml
#	indra/newview/skins/default/xui/fr/floater_camera.xml
#	indra/newview/skins/default/xui/fr/floater_camera_presets.xml
#	indra/newview/skins/default/xui/fr/floater_forget_user.xml
#	indra/newview/skins/default/xui/fr/floater_linkreplace.xml
#	indra/newview/skins/default/xui/fr/floater_people.xml
#	indra/newview/skins/default/xui/fr/floater_preferences_view_advanced.xml
#	indra/newview/skins/default/xui/fr/floater_preview_trash.xml
#	indra/newview/skins/default/xui/fr/floater_save_camera_preset.xml
#	indra/newview/skins/default/xui/fr/menu_gallery_outfit_tab.xml
#	indra/newview/skins/default/xui/fr/menu_viewer.xml
#	indra/newview/skins/default/xui/fr/notifications.xml
#	indra/newview/skins/default/xui/fr/panel_group_creation_sidetray.xml
#	indra/newview/skins/default/xui/fr/panel_group_roles.xml
#	indra/newview/skins/default/xui/fr/panel_login.xml
#	indra/newview/skins/default/xui/fr/panel_notification_list_item.xml
#	indra/newview/skins/default/xui/fr/panel_outfit_gallery.xml
#	indra/newview/skins/default/xui/fr/panel_outfit_gallery_item.xml
#	indra/newview/skins/default/xui/fr/panel_preferences_sound.xml
#	indra/newview/skins/default/xui/fr/panel_prim_media_controls.xml
#	indra/newview/skins/default/xui/fr/panel_progress.xml
#	indra/newview/skins/default/xui/fr/panel_region_environment.xml
#	indra/newview/skins/default/xui/fr/strings.xml
#	indra/newview/skins/default/xui/fr/teleport_strings.xml
#	indra/newview/skins/default/xui/fr/widgets/density_ctrl.xml
#	indra/newview/skins/default/xui/it/floater_avatar_textures.xml
#	indra/newview/skins/default/xui/it/floater_camera.xml
#	indra/newview/skins/default/xui/it/floater_camera_presets.xml
#	indra/newview/skins/default/xui/it/floater_god_tools.xml
#	indra/newview/skins/default/xui/it/floater_media_browser.xml
#	indra/newview/skins/default/xui/it/floater_people.xml
#	indra/newview/skins/default/xui/it/floater_preferences_view_advanced.xml
#	indra/newview/skins/default/xui/it/floater_save_camera_preset.xml
#	indra/newview/skins/default/xui/it/floater_stats.xml
#	indra/newview/skins/default/xui/it/menu_login.xml
#	indra/newview/skins/default/xui/it/menu_viewer.xml
#	indra/newview/skins/default/xui/it/notifications.xml
#	indra/newview/skins/default/xui/it/panel_group_roles.xml
#	indra/newview/skins/default/xui/it/panel_landmark_info.xml
#	indra/newview/skins/default/xui/it/panel_login.xml
#	indra/newview/skins/default/xui/it/panel_notifications_channel.xml
#	indra/newview/skins/default/xui/it/panel_outfit_gallery.xml
#	indra/newview/skins/default/xui/it/panel_outfit_gallery_item.xml
#	indra/newview/skins/default/xui/it/panel_place_profile.xml
#	indra/newview/skins/default/xui/it/panel_preferences_sound.xml
#	indra/newview/skins/default/xui/it/panel_prim_media_controls.xml
#	indra/newview/skins/default/xui/it/panel_region_environment.xml
#	indra/newview/skins/default/xui/it/sidepanel_appearance.xml
#	indra/newview/skins/default/xui/it/strings.xml
#	indra/newview/skins/default/xui/it/teleport_strings.xml
#	indra/newview/skins/default/xui/ja/floater_camera.xml
#	indra/newview/skins/default/xui/ja/floater_camera_presets.xml
#	indra/newview/skins/default/xui/ja/floater_people.xml
#	indra/newview/skins/default/xui/ja/floater_preferences_view_advanced.xml
#	indra/newview/skins/default/xui/ja/floater_save_camera_preset.xml
#	indra/newview/skins/default/xui/ja/notifications.xml
#	indra/newview/skins/default/xui/ja/panel_group_creation_sidetray.xml
#	indra/newview/skins/default/xui/ja/panel_group_roles.xml
#	indra/newview/skins/default/xui/ja/panel_login.xml
#	indra/newview/skins/default/xui/ja/panel_notification_list_item.xml
#	indra/newview/skins/default/xui/ja/panel_outfit_gallery.xml
#	indra/newview/skins/default/xui/ja/panel_outfit_gallery_item.xml
#	indra/newview/skins/default/xui/ja/panel_preferences_sound.xml
#	indra/newview/skins/default/xui/ja/panel_region_environment.xml
#	indra/newview/skins/default/xui/ja/strings.xml
#	indra/newview/skins/default/xui/ja/teleport_strings.xml
#	indra/newview/skins/default/xui/ja/widgets/density_ctrl.xml
#	indra/newview/skins/default/xui/pl/panel_group_creation_sidetray.xml
#	indra/newview/skins/default/xui/pl/panel_outfit_gallery.xml
#	indra/newview/skins/default/xui/pl/panel_outfit_snapshot_inventory.xml
#	indra/newview/skins/default/xui/pl/panel_profile_firstlife.xml
#	indra/newview/skins/default/xui/pl/panel_profile_pick.xml
#	indra/newview/skins/default/xui/pl/panel_profile_picks.xml
#	indra/newview/skins/default/xui/pl/panel_profile_secondlife.xml
#	indra/newview/skins/default/xui/pl/panel_region_access.xml
#	indra/newview/skins/default/xui/pl/panel_script_experience.xml
#	indra/newview/skins/default/xui/pt/notifications.xml
#	indra/newview/skins/default/xui/pt/panel_group_roles.xml
#	indra/newview/skins/default/xui/pt/panel_landmark_info.xml
#	indra/newview/skins/default/xui/pt/panel_login.xml
#	indra/newview/skins/default/xui/pt/panel_preferences_sound.xml
#	indra/newview/skins/default/xui/pt/strings.xml
2023-01-25 14:40:06 +01:00
Andrey Kleshchev a1931d8cc4 SL-18735 Using "Find original" in main inventory tab breaks inventory view
Fixes folders being invidible (missing arrange)
Fixes sroll to target not working reliably
2023-01-16 20:42:20 +02:00
Ansariel a9c29b4b81 Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer
# Conflicts:
#	indra/llui/lllineeditor.cpp
#	indra/llui/llmenugl.cpp
#	indra/llui/llmenugl.h
#	indra/llui/lltexteditor.cpp
#	indra/newview/llfloaterbump.cpp
#	indra/newview/llfloaterbump.h
#	indra/newview/llinventorypanel.cpp
#	indra/newview/llnetmap.cpp
2022-10-20 10:51:25 +02:00
Rye Mutt b9552e596f Reduce folderview menu bloat via lazy creation on right click 2022-10-19 16:21:05 -04:00
Ansariel ef88337eef Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
# Conflicts:
#	autobuild.xml
#	doc/contributions.txt
#	indra/llcommon/tests/llprocess_test.cpp
#	indra/newview/lldrawpoolavatar.cpp
#	indra/newview/llfloatermodelpreview.cpp
#	indra/newview/llmodelpreview.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/llvovolume.cpp
#	indra/newview/viewer_manifest.py
2022-03-02 10:12:19 +01:00
Andrey Kleshchev 97a103255e Merge branch 'master' (DRTVWR-557) into DRTVWR-546
# Conflicts:
#	autobuild.xml
#	doc/contributions.txt
#	indra/cmake/GLOD.cmake
#	indra/llcommon/tests/llprocess_test.cpp
#	indra/newview/VIEWER_VERSION.txt
#	indra/newview/lldrawpoolavatar.cpp
#	indra/newview/llfloatermodelpreview.cpp
#	indra/newview/llmodelpreview.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/llvovolume.cpp
#	indra/newview/viewer_manifest.py
2022-03-01 13:41:42 +02:00
Ansariel 0a0e2fe93e Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 2022-01-15 02:39:07 +01:00
Ptolemy b70614bd87 SL-16606: Add profiler category UI 2022-01-14 11:50:21 -08:00
Ansariel 63cc972499 Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
# Conflicts:
#	indra/llappearance/lldriverparam.h
#	indra/llcommon/llmemory.h
#	indra/llcommon/llprofiler.h
#	indra/llrender/llvertexbuffer.cpp
#	indra/llwindow/llwindow.cpp
#	indra/llwindow/llwindowwin32.h
#	indra/newview/app_settings/settings.xml
#	indra/newview/lldrawable.cpp
#	indra/newview/lldrawable.h
#	indra/newview/lldrawpoolalpha.cpp
#	indra/newview/lldrawpoolavatar.cpp
#	indra/newview/lldrawpooltree.cpp
#	indra/newview/lldrawpoolwater.cpp
#	indra/newview/llface.cpp
#	indra/newview/llinventoryfilter.cpp
#	indra/newview/llselectmgr.h
#	indra/newview/llspatialpartition.cpp
#	indra/newview/llviewermenu.cpp
#	indra/newview/llviewerobject.cpp
#	indra/newview/llvieweroctree.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/llvovolume.cpp
#	indra/newview/llvowlsky.cpp
#	indra/newview/pipeline.cpp
#	indra/newview/skins/default/xui/en/floater_stats.xml
2021-11-12 17:31:39 +01:00
Dave Parks 8d20480c5f SL-16148 SL-16244 SL-16270 SL-16253 Remove most BlockTimers, remove LLMemTracked, introduce alignas, hook most/all reamining allocs, disable synchronous occlusion, and convert frequently accessed LLSingletons to LLSimpleton 2021-10-28 18:06:21 +00:00
Ansariel 2253723705 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-07-21 14:13:23 +02:00
Andrey Lihatskiy 9873e7bba9 Merge branch 'master' into DRTVWR-527-maint 2021-07-19 22:22:32 +03:00
Ansariel 885215519d Merge branch 'DRTVWR-527-maint' of https://bitbucket.org/lindenlab/viewer 2021-04-12 11:56:45 +02:00
Andrey Kleshchev 5e134b4732 SL-13182 Fix root folder's state 2021-04-09 17:19:43 +03:00
Ansariel 14fb8f66f8 Merge branch 'DRTVWR-516-maint' of https://bitbucket.org/lindenlab/viewer 2020-09-24 16:34:12 +02:00
Andrey Kleshchev 0d7f6d917a SL-13729 Performance of LLUI and LLRender2D #3 2020-09-18 17:27:12 +03:00
Andrey Kleshchev a5c8b1cbe2 SL-13729 Performance of LLUI and LLRender2D #2 2020-09-17 20:39:45 +03:00