f65cddf860
Merge branch 'contribute' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/llcommon/llsdserialize.cpp
# indra/llcommon/lluuid.cpp
# indra/llcommon/lluuid.h
# indra/llprimitive/llmodel.cpp
# indra/newview/llfilepicker.cpp
# indra/newview/llfilepicker.h
# indra/newview/llfilepicker_mac.h
# indra/newview/llfilepicker_mac.mm
# indra/newview/llinventorymodel.cpp
# indra/newview/llviewerwearable.h
# indra/newview/skins/default/xui/da/floater_about.xml
# indra/newview/skins/default/xui/da/floater_fs_voice_controls.xml
# indra/newview/skins/default/xui/da/menu_inspect_self_gear.xml
# indra/newview/skins/default/xui/de/floater_about.xml
# indra/newview/skins/default/xui/de/floater_perm_prefs.xml
# indra/newview/skins/default/xui/de/menu_inspect_avatar_gear.xml
# indra/newview/skins/default/xui/de/menu_inspect_self_gear.xml
# indra/newview/skins/default/xui/en/floater_about.xml
# indra/newview/skins/default/xui/en/strings.xml
# indra/newview/skins/default/xui/es/floater_about.xml
# indra/newview/skins/default/xui/es/menu_inspect_avatar_gear.xml
# indra/newview/skins/default/xui/es/menu_inspect_self_gear.xml
# indra/newview/skins/default/xui/fr/floater_about.xml
# indra/newview/skins/default/xui/fr/floater_perm_prefs.xml
# indra/newview/skins/default/xui/fr/menu_inspect_avatar_gear.xml
# indra/newview/skins/default/xui/fr/menu_inspect_self_gear.xml
# indra/newview/skins/default/xui/it/floater_about.xml
# indra/newview/skins/default/xui/it/floater_perm_prefs.xml
# indra/newview/skins/default/xui/it/menu_inspect_avatar_gear.xml
# indra/newview/skins/default/xui/it/menu_inspect_self_gear.xml
# indra/newview/skins/default/xui/ja/floater_fs_voice_controls.xml
# indra/newview/skins/default/xui/ja/menu_inspect_self_gear.xml
# indra/newview/skins/default/xui/pl/floater_about.xml
# indra/newview/skins/default/xui/pl/floater_about_land.xml
# indra/newview/skins/default/xui/pl/floater_animation_bvh_preview.xml
# indra/newview/skins/default/xui/pl/floater_associate_listing.xml
# indra/newview/skins/default/xui/pl/notifications.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/pl/strings.xml
# indra/newview/skins/default/xui/pt/floater_about.xml
# indra/newview/skins/default/xui/pt/floater_fs_voice_controls.xml
# indra/newview/skins/default/xui/pt/menu_inspect_self_gear.xml
# indra/newview/skins/default/xui/ru/floater_about.xml
# indra/newview/skins/default/xui/ru/floater_perm_prefs.xml
# indra/newview/skins/default/xui/ru/menu_inspect_avatar_gear.xml
# indra/newview/skins/default/xui/ru/menu_inspect_self_gear.xml
# indra/newview/skins/default/xui/tr/floater_about.xml
# indra/newview/skins/default/xui/tr/floater_fs_voice_controls.xml
# indra/newview/skins/default/xui/tr/menu_inspect_self_gear.xml
# indra/newview/skins/default/xui/zh/floater_about.xml
# indra/newview/skins/default/xui/zh/floater_fs_voice_controls.xml
# indra/newview/skins/default/xui/zh/menu_inspect_self_gear.xml
2023-03-01 12:54:24 +01:00
7731ee8d50
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/llcommon/llsdserialize.cpp
# indra/llcommon/llsdserialize.h
# indra/newview/llmeshrepository.cpp
2023-02-28 12:44:49 +01:00
998dc17eff
Merge branch 'DRTVWR-567' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llfloatermarketplacelistings.cpp
# indra/newview/llfloatermarketplacelistings.h
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventoryfunctions.cpp
# indra/newview/skins/default/colors.xml
# indra/newview/skins/default/xui/en/floater_snapshot.xml
2023-02-14 17:32:34 +01:00
4bc9331ddd
SL-19140 Fix contribution doc
2023-02-14 18:04:46 +02:00
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
0630e95ce7
SL-19207 Update contributions document
2023-02-13 20:37:20 +02:00
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
a2f8f3db06
SL-19159 Update contribution doc
2023-02-07 23:55:22 +02:00
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
2ff9900cd9
Merge branch 'DRTVWR-577-maint-S' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/llcommon/lluuid.cpp
# indra/llprimitive/llmodel.cpp
# indra/newview/llfilepicker.cpp
# indra/newview/llfilepicker_mac.mm
# indra/newview/skins/default/xui/da/floater_about.xml
# indra/newview/skins/default/xui/de/floater_about.xml
# indra/newview/skins/default/xui/en/floater_about.xml
# indra/newview/skins/default/xui/es/floater_about.xml
# indra/newview/skins/default/xui/fr/floater_about.xml
# indra/newview/skins/default/xui/it/floater_about.xml
# indra/newview/skins/default/xui/pt/floater_about.xml
# indra/newview/skins/default/xui/ru/floater_about.xml
# indra/newview/skins/default/xui/tr/floater_about.xml
# indra/newview/skins/default/xui/zh/floater_about.xml
2023-02-03 20:57:40 +01:00
51142d1341
Merge branch 'main' into DRTVWR-567
...
# Conflicts:
# indra/newview/llappearancemgr.cpp
# indra/newview/llpanelmaininventory.cpp
2023-02-03 16:53:33 +02:00
06ac6c615c
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# .gitignore
# doc/contributions.txt
# indra/cmake/FindOpenJPEG.cmake
# indra/cmake/FreeType.cmake
# indra/cmake/OpenJPEG.cmake
# indra/cmake/UI.cmake
# indra/cmake/ViewerMiscLibs.cmake
# indra/llwindow/CMakeLists.txt
# indra/newview/CMakeLists.txt
# indra/newview/llviewercontrol.cpp
# indra/newview/viewer_manifest.py
2023-02-03 15:34:47 +01:00
73e5615d43
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/llimagej2coj/llimagej2coj.cpp
# indra/newview/VIEWER_VERSION.txt
# indra/newview/app_settings/shaders/class1/deferred/skyF.glsl
# indra/newview/app_settings/shaders/class1/deferred/skyV.glsl
# indra/newview/app_settings/shaders/class2/deferred/skyF.glsl
# indra/newview/llsettingsvo.cpp
2023-02-03 11:11:13 +01:00
e7ba1753d2
Merge branch 'main' into DRTVWR-539
...
# Conflicts:
# doc/contributions.txt
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/cmake/FindOpenJPEG.cmake
# indra/cmake/OpenJPEG.cmake
# indra/integration_tests/llui_libtest/CMakeLists.txt
# indra/newview/CMakeLists.txt
2023-02-03 01:46:01 +02:00
5fabfa50d7
Merge remote-tracking branch 'origin/main' into DRTVWR-559
2023-02-02 12:11:40 -08:00
b2e3a07ab4
SL-18988 Updated contributions.txt
2023-02-01 16:38:47 +02:00
6cbca4da71
Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llcommon/llprofiler.h
# indra/llcommon/lluuid.cpp
# indra/llprimitive/llmodel.cpp
# indra/llrender/llrendertarget.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/app_settings/shaders/class1/deferred/multiPointLightF.glsl
# indra/newview/app_settings/shaders/class1/deferred/pointLightF.glsl
# indra/newview/llviewerwindow.cpp
# indra/newview/pipeline.cpp
# indra/newview/skins/default/xui/da/floater_about.xml
# indra/newview/skins/default/xui/de/floater_about.xml
# indra/newview/skins/default/xui/en/floater_about.xml
# indra/newview/skins/default/xui/es/floater_about.xml
# indra/newview/skins/default/xui/fr/floater_about.xml
# indra/newview/skins/default/xui/it/floater_about.xml
# indra/newview/skins/default/xui/pt/floater_about.xml
# indra/newview/skins/default/xui/ru/floater_about.xml
# indra/newview/skins/default/xui/tr/floater_about.xml
# indra/newview/skins/default/xui/zh/floater_about.xml
2023-02-01 11:40:17 +01:00
b5b0a3fbf6
SL-19110 Fix xxhash build link and properly register contribution
2023-01-31 22:05:42 +02:00
8518154426
SL-19110 Fix xxhash build link and properly register contribution
2023-01-31 19:17:34 +02:00
8d154eaa8c
Merge branch 'contribute' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llappearance/llavatarappearance.cpp
# indra/llappearance/lldriverparam.cpp
# indra/llappearance/llwearable.cpp
# indra/llcommon/llerror.cpp
# indra/llcommon/llqueuedthread.cpp
# indra/llcommon/llsdserialize.h
# indra/llcommon/llthreadsafequeue.h
# indra/newview/app_settings/settings.xml
# indra/newview/llpathfindingnavmesh.cpp
# indra/newview/llviewerassetstorage.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/skins/default/xui/de/floater_flickr.xml
# indra/newview/skins/default/xui/de/panel_flickr_photo.xml
# indra/newview/skins/default/xui/en/floater_about_land.xml
# indra/newview/skins/default/xui/en/panel_settings_sky_atmos.xml
# indra/newview/skins/default/xui/en/panel_settings_sky_clouds.xml
# indra/newview/skins/default/xui/en/panel_settings_sky_sunmoon.xml
# indra/newview/skins/default/xui/fr/floater_flickr.xml
# indra/newview/skins/default/xui/fr/panel_flickr_account.xml
# indra/newview/skins/default/xui/fr/panel_flickr_photo.xml
# indra/newview/skins/default/xui/it/floater_flickr.xml
# indra/newview/skins/default/xui/it/panel_flickr_photo.xml
# indra/newview/skins/default/xui/ja/floater_flickr.xml
# indra/newview/skins/default/xui/ja/panel_flickr_photo.xml
# indra/newview/skins/default/xui/pl/floater_avatar_render_settings.xml
# indra/newview/skins/default/xui/pl/floater_ban_duration.xml
# indra/newview/skins/default/xui/pl/floater_camera_presets.xml
# indra/newview/skins/default/xui/pl/floater_classified.xml
# indra/newview/skins/default/xui/pl/floater_create_landmark.xml
# indra/newview/skins/default/xui/pl/floater_delete_pref_preset.xml
# indra/newview/skins/default/xui/pl/floater_fixedenvironment.xml
# indra/newview/skins/default/xui/pl/floater_flickr.xml
# indra/newview/skins/default/xui/pl/floater_linkreplace.xml
# indra/newview/skins/default/xui/pl/floater_load_pref_preset.xml
# indra/newview/skins/default/xui/pl/floater_my_environments.xml
# indra/newview/skins/default/xui/pl/floater_my_scripts.xml
# indra/newview/skins/default/xui/pl/floater_notifications_tabbed.xml
# indra/newview/skins/default/xui/pl/floater_pick_track.xml
# indra/newview/skins/default/xui/pl/floater_preferences_graphics_advanced.xml
# indra/newview/skins/default/xui/pl/floater_preferences_view_advanced.xml
# indra/newview/skins/default/xui/pl/floater_preview_trash.xml
# indra/newview/skins/default/xui/pl/floater_profile.xml
# indra/newview/skins/default/xui/pl/floater_settings_picker.xml
# indra/newview/skins/default/xui/pl/floater_simple_outfit_snapshot.xml
# indra/newview/skins/default/xui/pl/menu_avatar_rendering_settings.xml
# indra/newview/skins/default/xui/pl/menu_avatar_rendering_settings_add.xml
# indra/newview/skins/default/xui/pl/panel_flickr_photo.xml
# indra/newview/skins/default/xui/pl/panel_progress.xml
# indra/newview/skins/default/xui/pl/panel_settings_sky_atmos.xml
# indra/newview/skins/default/xui/pl/panel_settings_sky_clouds.xml
# indra/newview/skins/default/xui/pl/panel_settings_sky_sunmoon.xml
# indra/newview/skins/default/xui/ru/floater_flickr.xml
# indra/newview/skins/default/xui/ru/panel_flickr_account.xml
# indra/newview/skins/default/xui/ru/panel_flickr_photo.xml
2023-01-13 15:19:29 +01:00
5d6371f568
SL-18937 Update contributions
2023-01-10 20:05:01 +02:00
64a42aceba
SL-18904 Remove unused translation files
2023-01-04 23:52:41 +02:00
5ea7cec092
SL-18893 Update list of contributors
2023-01-04 22:21:20 +02:00
68c04f41ad
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/newview/viewer_manifest.py
2022-12-19 22:59:03 +01:00
0ffe9ff0ae
SL-15175 Updates for TP states while the viewer is minimized
2022-12-13 21:25:16 +02:00
15f55c0a88
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# doc/contributions.txt
# indra/newview/llappviewer.cpp
2022-12-13 18:03:50 +01:00
553a98723b
Merge branch 'main' into DRTVWR-539
...
# Conflicts:
# doc/contributions.txt
# indra/newview/llappviewer.cpp
# indra/newview/skins/default/colors.xml
2022-12-13 08:05:03 +02:00
5f81627faf
Merge branch 'DRTVWR-570-maint-Q' of https://github.com/secondlife/viewer
...
# Conflicts:
# doc/contributions.txt
# indra/newview/llfloateravatar.h
2022-12-12 22:11:54 +01:00
67081f9728
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# doc/contributions.txt
# indra/newview/llfloater360capture.cpp
2022-12-12 22:09:54 +01:00
f7838ca17c
Merge branch 'main' into DRTVWR-568
2022-12-12 11:13:10 -08:00
f836194516
Merge branch 'main' into DRTVWR-570-maint-Q
...
# Conflicts:
# doc/contributions.txt
# indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
# indra/newview/llfloater360capture.cpp
2022-12-12 20:53:11 +02:00
b4dd4271a1
SL-16874 Added tool tips to buttons displayed by llDialog()
2022-12-12 20:22:50 +02:00
4e87c96292
Merge branch 'DRTVWR-539' of https://github.com/secondlife/viewer
...
# Conflicts:
# autobuild.xml
# indra/newview/llfloater360capture.cpp
# indra/newview/llperfstats.cpp
# indra/newview/llperfstats.h
# indra/newview/llvoavatar.cpp
# indra/newview/pipeline.cpp
2022-11-23 10:08:56 +01:00
ddfd54650e
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-568
2022-11-23 10:02:57 +01:00
de0317cc3f
Merge branch 'DRTVWR-568' into DRTVWR-539
2022-11-22 23:12:05 +02:00
abbfb9b7d0
Merge branch 'DRTVWR-565-maint-P' of https://github.com/secondlife/viewer
2022-11-22 16:23:13 +01:00
24993a914f
SL-18637 Reverted material shader changes
...
original fix by Beq Janus
2022-11-14 23:58:14 +02:00
cb10f3b149
Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# doc/contributions.txt
# indra/llcommon/threadsafeschedule.h
# indra/llwindow/llwindowmacosx-objc.mm
# indra/llwindow/llwindowmacosx.cpp
# indra/newview/llappdelegate-objc.mm
# indra/newview/llfilepicker_mac.mm
# indra/newview/llsettingsvo.cpp
# indra/newview/llvosky.cpp
2022-11-11 12:15:54 +01:00
72b1cfc76b
SL-18586 FIXED Crash when opening 360 snapshot
2022-11-09 14:42:27 +02:00
55c27641fe
Merge remote-tracking branch 'BeqJanus/ll-viewer-pull-requests/Beq-alpha-mask-on-emissive-fix' into DRTVWR-570-maint-Q
2022-11-09 00:45:01 +02:00
2904062948
Merge remote-tracking branch 'ZiRee/viewer/master' into DRTVWR-570-maint-Q
2022-11-09 00:41:58 +02:00
dedee8ba50
initial merge form DRTVWR-539 branch
2022-11-02 22:37:24 +00:00
da8f95ad22
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-11-02 18:06:07 +01:00
67ce0e77d7
Merge remote-tracking branch 'RyeMutt/viewer/mac-fixes' into DRTVWR-570-maint-Q
2022-11-02 18:50:18 +02:00
7732257ea5
Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer
2022-11-02 13:05:00 +01:00
39e08b34b1
Merge remote-tracking branch 'RyeMutt/viewer/llsd-usage-fixes' into DRTVWR-570-maint-Q
2022-11-01 23:11:57 +02:00
9ee1a75474
Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llcharacter/llkeyframemotion.cpp
# indra/llcommon/lluuid.cpp
# indra/llcommon/lluuid.h
# indra/llui/llscrolllistctrl.cpp
# indra/llui/llscrolllistctrl.h
# indra/newview/app_settings/settings.xml
# indra/newview/llfloatersettingsdebug.cpp
# indra/newview/llfloatersettingsdebug.h
# indra/newview/skins/default/xui/en/floater_settings_debug.xml
# indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
2022-11-01 17:17:56 +01:00
1bdfb7df70
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-11-01 15:16:40 +01:00
d4d5d4018d
Merge remote-tracking branch 'RyeMutt/viewer/datapacker-crashfixes/datapacker-crashfixes' into DRTVWR-570-maint-Q
2022-10-29 00:32:59 +03:00
0aabcf9a85
Merge branch 'master' into DRTVWR-539
2022-10-27 14:23:42 +03:00
b8f75bd161
Merge branch 'master' into DRTVWR-570-maint-Q
2022-10-26 23:58:06 +03:00
aad3b32a92
Merge branch 'master' into DRTVWR-568
2022-10-26 12:07:12 -07:00
8b2b11d4a0
Merge branch 'master' of https://bitbucket.org/lindenlab/viewer
2022-10-26 20:42:44 +02:00
242c8cb5ed
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# autobuild.xml
# doc/contributions.txt
# indra/llcommon/CMakeLists.txt
# indra/llprimitive/llmodel.cpp
# indra/llwindow/CMakeLists.txt
# indra/llwindow/llwindowmacosx.cpp
# indra/newview/llinventorymodel.cpp
# indra/newview/lllegacyatmospherics.cpp
# indra/newview/llmeshrepository.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvopartgroup.cpp
# indra/newview/llworld.cpp
2022-10-25 11:49:36 +02:00
80585d56fd
Merge master into DRTVWR-568 (and fix conflicts)
2022-10-24 17:48:16 -07:00
439aa79414
SL-18432 Fix for alpha sorting
2022-10-24 22:14:20 +03:00
717b34f53f
Merge branch 'master' into DRTVWR-539
...
# Conflicts:
# indra/newview/llfloaterpreference.cpp
# indra/newview/llviewercontrol.cpp
2022-10-21 14:42:53 +03:00
8b0d341aca
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-10-21 12:34:53 +02:00
e0ace0c722
Merge branch 'master' into DRTVWR-570-maint-Q
...
# Conflicts:
# indra/newview/llnetmap.cpp
# indra/newview/llnetmap.h
2022-10-20 22:34:11 +03:00
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
f0cd5407c4
SL-18412 Merge remote-tracking branch 'RyeMutt/viewer/menu-leaks' into DRTVWR-570-maint-Q
2022-10-19 23:53:53 +03:00
2b65ae8215
Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer
2022-10-15 17:33:22 +02:00
dbbc710739
SL-18348 FIXED Include next/previous face doesn't work
2022-10-13 14:39:29 +03:00
2aceea66ff
Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llcommon/llsdserialize.cpp
# indra/llmath/llvolume.cpp
# indra/llmath/llvolume.h
# indra/newview/llfloateropenobject.cpp
# indra/newview/llfloateropenobject.h
# indra/newview/llmaterialmgr.cpp
# indra/newview/llmeshrepository.cpp
# indra/newview/llmeshrepository.h
# indra/newview/skins/default/xui/en/floater_openobject.xml
2022-10-01 13:10:39 +02:00
338aeef7e9
SL-14696 SL-13629 Re-add gradation fix after merging a contribution
2022-10-01 00:48:25 +03:00
6614a6ee99
SL-18249 Optimizations to mesh and material loading
2022-09-28 18:42:10 +03:00
198420f9f6
SL-18248 Move frame breakdown stats to 'Scene loading statistics' floater
2022-09-28 14:16:16 +03:00
1fc3aaff9b
Merge branch 'DRTVWR-568_cmake' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# .gitignore
# autobuild.xml
# indra/CMakeLists.txt
# indra/cmake/00-Common.cmake
# indra/cmake/Boost.cmake
# indra/cmake/BuildVersion.cmake
# indra/cmake/CEFPlugin.cmake
# indra/cmake/CMakeLists.txt
# indra/cmake/CURL.cmake
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/cmake/DBusGlib.cmake
# indra/cmake/DragDrop.cmake
# indra/cmake/FMODSTUDIO.cmake
# indra/cmake/FindHUNSPELL.cmake
# indra/cmake/FindJsonCpp.cmake
# indra/cmake/FindOpenJPEG.cmake
# indra/cmake/FindURIPARSER.cmake
# indra/cmake/FreeType.cmake
# indra/cmake/GLH.cmake
# indra/cmake/Hunspell.cmake
# indra/cmake/JsonCpp.cmake
# indra/cmake/LLKDU.cmake
# indra/cmake/LLPhysicsExtensions.cmake
# indra/cmake/LLPlugin.cmake
# indra/cmake/LLWindow.cmake
# indra/cmake/Linking.cmake
# indra/cmake/MESHOPTIMIZER.cmake
# indra/cmake/MediaPluginBase.cmake
# indra/cmake/NGHTTP2.cmake
# indra/cmake/OPENAL.cmake
# indra/cmake/OpenGL.cmake
# indra/cmake/OpenJPEG.cmake
# indra/cmake/OpenSSL.cmake
# indra/cmake/PNG.cmake
# indra/cmake/Tracy.cmake
# indra/cmake/UI.cmake
# indra/cmake/Variables.cmake
# indra/cmake/ViewerMiscLibs.cmake
# indra/cmake/ZLIBNG.cmake
# indra/cmake/bugsplat.cmake
# indra/integration_tests/llui_libtest/CMakeLists.txt
# indra/linux_crash_logger/CMakeLists.txt
# indra/llaudio/CMakeLists.txt
# indra/llcommon/CMakeLists.txt
# indra/llcommon/llapp.cpp
# indra/llcorehttp/CMakeLists.txt
# indra/llimagej2coj/CMakeLists.txt
# indra/llinventory/CMakeLists.txt
# indra/llmath/CMakeLists.txt
# indra/llmath/llcalcparser.h
# indra/llmessage/CMakeLists.txt
# indra/llprimitive/CMakeLists.txt
# indra/llrender/CMakeLists.txt
# indra/llrender/llglslshader.cpp
# indra/llwindow/CMakeLists.txt
# indra/media_plugins/CMakeLists.txt
# indra/media_plugins/base/CMakeLists.txt
# indra/newview/CMakeLists.txt
# indra/newview/llappviewerwin32.cpp
# indra/newview/llxmlrpclistener.cpp
# indra/newview/llxmlrpctransaction.cpp
# indra/newview/viewer_manifest.py
# indra/test/CMakeLists.txt
2022-09-17 23:12:34 +02:00
9bad5d08fb
SL-17238 Large cmake contribution by NickyD
2022-09-17 19:30:31 +03:00
248bf15ce8
SL-17238 Large cmake contribution by NickyD
2022-09-17 14:03:55 +03:00
55f51f4829
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2022-08-31 17:02:33 +02:00
a9a63db0f0
Merge branch 'master' into DRTVWR-548-maint-N
2022-08-31 00:17:37 +03:00
2c0edbac18
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master
2022-06-29 22:04:20 +02:00
2e837e5389
Merge branch 'master' into DRTVWR-548-maint-N
...
# Conflicts:
# doc/contributions.txt
# indra/newview/llviewercontrol.cpp
2022-06-29 20:51:08 +03:00
1fbfe48f84
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master
2022-06-29 18:23:17 +02:00
1b369c7f10
Merge branch 'master' (DRTVWR-543) into DRTVWR-483
...
# Conflicts:
# indra/newview/llviewertexturelist.cpp
2022-06-29 18:30:05 +03:00
cfb6c083fe
Merge branch 'DRTVWR-548-maint-N' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llcommon/CMakeLists.txt
# indra/llfilesystem/lldiskcache.cpp
# indra/llwindow/CMakeLists.txt
# indra/newview/app_settings/settings.xml
# indra/newview/llappviewer.cpp
2022-06-24 22:18:44 +02:00
6259666be0
Merge branch 'DRTVWR-548-maint-N' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# indra/llmath/lloctree.h
# indra/llmath/llvolume.cpp
# indra/llrender/llgl.cpp
# indra/newview/installers/windows/installer_template.nsi
# indra/newview/installers/windows/lang_da.nsi
# indra/newview/installers/windows/lang_de.nsi
# indra/newview/installers/windows/lang_en-us.nsi
# indra/newview/installers/windows/lang_es.nsi
# indra/newview/installers/windows/lang_fr.nsi
# indra/newview/installers/windows/lang_it.nsi
# indra/newview/installers/windows/lang_ja.nsi
# indra/newview/installers/windows/lang_pl.nsi
# indra/newview/installers/windows/lang_pt-br.nsi
# indra/newview/installers/windows/lang_ru.nsi
# indra/newview/installers/windows/lang_tr.nsi
# indra/newview/installers/windows/lang_zh.nsi
# indra/newview/lldynamictexture.cpp
# indra/newview/llfloaterpreference.cpp
# indra/newview/llviewercontrol.cpp
# indra/newview/llviewermenu.cpp
# indra/newview/llvovolume.cpp
2022-06-22 21:11:47 +02:00
1167ea994c
SL-17634 Replace deprecated carbon Gestalt calls
2022-06-22 18:00:49 +03:00
791b7ff0e9
SL-17585 Don't bother users with dialogs if we are already quiting
2022-06-20 17:07:49 +03:00
6ccdf5545d
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546
...
# Conflicts:
# autobuild.xml
# indra/llcommon/CMakeLists.txt
# indra/llrender/llgl.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llface.cpp
# indra/newview/llflexibleobject.cpp
# indra/newview/llvovolume.cpp
2022-05-27 11:41:45 +02:00
3da7a50b71
Merge branch 'master' into DRTVWR-543-maint
...
# Conflicts:
# autobuild.xml
# indra/cmake/LLCommon.cmake
# indra/llcommon/CMakeLists.txt
# indra/llrender/llgl.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llface.cpp
# indra/newview/llflexibleobject.cpp
# indra/newview/llvovolume.cpp
2022-05-27 02:51:33 +03:00
b61dfd131d
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546
2022-05-26 11:36:16 +02:00
2ed401882e
Merge branch 'master' into DRTVWR-483
...
# Conflicts:
# indra/newview/llviewertexturelist.cpp
2022-05-26 02:56:29 +03:00
c1a4be7dae
Merge branch 'DRTVWR-543-maint' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# autobuild.xml
# indra/cmake/Boost.cmake
# indra/llappearance/lltexlayer.cpp
# indra/llinventory/llparcel.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llappviewer.cpp
# indra/newview/llface.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llvovolume.cpp
2022-04-19 13:21:52 +02:00
4e282db26b
SL-17218: Credit NickyD's contributions to this Jira.
2022-04-14 15:32:19 -04:00
51e318fd8d
SL-14541 Pull in updated zlib-ng
...
Nicky Dasmijn's contribution for zlib-ng Linux builds
2022-03-05 11:34:13 +02:00
455b750cde
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/newview/llviewermenu.cpp
2022-03-02 12:04:09 +01:00
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
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
e70fe3a50d
Merge branch 'master' into DRTVWR-483
...
# Conflicts:
# indra/newview/llviewermenu.cpp
2022-02-28 22:01:18 +02:00
828fbdc571
Merge branch 'DRTVWR-553-maint-mix-JK' of https://bitbucket.org/lindenlab/viewer
2022-02-02 10:37:33 +01:00
0bef5e553e
Revert "SL-14717 Ability to trigger left clicks (and more) on animesh objects"
...
This reverts commit 8215fff0c2
2022-01-21 19:13:28 +02:00
95db09d8d0
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-530
...
# Conflicts:
# indra/newview/llappviewer.cpp
# indra/newview/llkeyconflict.cpp
2022-01-10 23:31:49 +01:00
469ce7f7f6
Merge branch 'DRTVWR-530-maint' into DRTVWR-553-maint-mix-JK
...
# Conflicts:
# indra/newview/app_settings/key_bindings.xml
# indra/newview/llappviewer.cpp
# indra/newview/llkeyconflict.cpp
2022-01-10 23:51:52 +02:00
b33e18585d
Merge branch 'master' into DRTVWR-483
2021-12-26 14:00:00 +02:00
f19311bf7a
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-12-20 12:45:10 +01:00
496156073b
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-12-16 18:56:31 +01:00
2ba4a164e2
Merge branch 'DRTVWR-527-maint' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# autobuild.xml
# indra/cmake/Python.cmake
# indra/lib/python/indra/util/llmanifest.py
# indra/lib/python/indra/util/test_win32_manifest.py
# indra/llaudio/llstreamingaudio_fmodstudio.cpp
# indra/llaudio/llstreamingaudio_fmodstudio.h
# indra/llcommon/llerror.cpp
# indra/newview/llappviewer.cpp
# indra/newview/lleventnotifier.cpp
# indra/newview/llpanellandmarks.cpp
# indra/newview/llpreviewanim.cpp
# indra/newview/llpreviewanim.h
# indra/newview/llviewerregion.cpp
# indra/newview/skins/default/xui/de/menu_place_add_button.xml
# indra/newview/skins/default/xui/it/menu_place_add_button.xml
# indra/newview/skins/default/xui/it/menu_teleport_history_item.xml
# indra/newview/skins/default/xui/ja/menu_place_add_button.xml
# indra/newview/skins/default/xui/pl/menu_place_add_button.xml
# indra/newview/skins/default/xui/pl/menu_teleport_history_item.xml
# indra/newview/skins/default/xui/ru/menu_place_add_button.xml
# indra/newview/skins/default/xui/ru/menu_teleport_history_item.xml
# indra/newview/viewer_manifest.py
2021-12-16 12:32:34 +01:00
39f272278c
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# indra/media_plugins/cef/media_plugin_cef.cpp
2021-12-16 10:20:56 +01:00
6663bc6f85
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
...
# Conflicts:
# autobuild.xml
# indra/llfilesystem/llfilesystem.cpp
# indra/newview/CMakeLists.txt
# indra/newview/llappviewer.cpp
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/llviewercontrol.cpp
2021-12-16 09:49:35 +01:00
cf35d27dfb
DRTVWR-546 merge up to 6.5.2
2021-12-15 14:37:18 -07:00
edb6293528
Merge branch 'master' into DRTVWR-530-maint
2021-12-15 21:50:40 +02:00
7c1cd47772
Merge branch 'master' (DRTVWR-552) into DRTVWR-527-maint
...
# Conflicts:
# indra/media_plugins/cef/media_plugin_cef.cpp - setOnLoadEndCallback
# indra/newview/llviewerassetstorage.cpp - mAssetCoroCount
2021-12-15 21:16:47 +02:00
442abdaac7
SL-16438 Machine id for Linux is always 0
2021-12-03 00:49:33 +02:00
30ad27c027
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
2021-11-16 21:09:53 +01:00
c2f8517118
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-11-16 21:01:05 +01:00
353329c2c2
DRTVWR-546 merge in master v6.5.1
2021-11-16 11:44:55 -07:00
969762f162
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-11-16 16:29:50 +01:00
f00647b6fd
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-11-16 15:38:25 +01:00
be25e64888
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-11-16 13:54:22 +01:00
627eecd577
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-11-16 08:22:59 +01:00
981cdca0a5
Merge branch 'master' into DRTVWR-483
...
# Conflicts:
# indra/llui/lltextbase.h
# indra/newview/VIEWER_VERSION.txt
2021-11-16 01:34:29 +02:00
0bffd3d365
Merge branch 'master' into DRTVWR-519
...
# Conflicts:
# README.md
2021-11-16 01:21:05 +02:00
30c381406c
Merge branch 'master' into DRTVWR-530-maint
...
# Conflicts:
# doc/contributions.txt
2021-11-16 01:09:11 +02:00
f9373a9b4e
Merge branch 'master' into DRTVWR-527-maint
...
# Conflicts:
# autobuild.xml
# indra/newview/installers/windows/lang_pl.nsi
# indra/newview/llfloaterpreference.cpp
# indra/newview/llinventorymodel.cpp
2021-11-16 00:54:53 +02:00
790ead2ef2
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-541
...
# Conflicts:
# doc/contributions.txt
# indra/llcommon/llmemory.h
# indra/llcommon/llprofiler.h
# indra/llcommon/lltracerecording.h
# indra/newview/llappviewer.cpp
# indra/newview/lldrawpool.cpp
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/lldrawpoolbump.cpp
# indra/newview/llvoavatar.cpp
# indra/newview/llvovolume.cpp
# indra/newview/pipeline.cpp
2021-11-12 17:43:32 +01:00
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
7427b46ea5
Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer
...
# Conflicts:
# .gitignore
# indra/cmake/Copy3rdPartyLibs.cmake
# indra/llcommon/llcommon.cpp
# indra/llcommon/llerror.cpp
# indra/llcommon/llprofiler.h
# indra/llcommon/llthread.cpp
# indra/llimage/llimageworker.cpp
# indra/llprimitive/llmodel.h
# indra/llrender/llfontgl.cpp
# indra/llrender/llfontgl.h
# indra/llrender/llgl.cpp
# indra/llrender/llvertexbuffer.cpp
# indra/llrender/llvertexbuffer.h
# indra/llwindow/llwindowmacosx.h
# indra/llwindow/llwindowwin32.cpp
# indra/llwindow/llwindowwin32.h
# indra/newview/app_settings/settings.xml
# indra/newview/llappviewer.cpp
# indra/newview/llappviewer.h
# indra/newview/lldrawpoolavatar.cpp
# indra/newview/lldrawpoolavatar.h
# indra/newview/lldynamictexture.cpp
# indra/newview/llfloatermodelpreview.cpp
# indra/newview/llimview.cpp
# indra/newview/llmeshrepository.h
# indra/newview/llmodelpreview.cpp
# indra/newview/llnetmap.cpp
# indra/newview/llskinningutil.cpp
# indra/newview/llskinningutil.h
# indra/newview/llspatialpartition.cpp
# indra/newview/llteleporthistory.cpp
# indra/newview/llviewerdisplay.cpp
# indra/newview/llviewerobject.cpp
# indra/newview/llviewerobjectlist.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/llvoicevivox.cpp
# indra/newview/llvosky.cpp
# indra/newview/llvovolume.cpp
2021-11-12 15:21:52 +01:00
02bc150a7f
Merge branch 'DRTVWR-541' of https://bitbucket.org/lindenlab/viewer
2021-10-28 12:47:09 +02:00
ad91d0fd92
SL-16127: Make another pass removing redundant LLSD op [] calls, unused vars, and use atmospheric already calculated
2021-10-27 10:05:13 -07:00
32f46e17d3
SL-16027: Fix SL-15962 breaking Tracy OpenGL. Can now log memory + OpenGL in Tracy at the same time.
2021-10-15 16:13:06 -07:00
0911cae538
Initial merge of DRTVWR-541 into FS
...
Fixup a few niggly mistakes from the LL work
Add a couple of missing macros
replace all FS tracy macros with the corresponding LL ones.
2021-10-09 20:18:14 +01:00
a68ca665ad
SL-15958 Stop impostored avatars from casting shadows
2021-09-22 17:51:00 +03:00
5ec4c0d022
Merge branch 'DRTVWR-530-maint' of https://bitbucket.org/lindenlab/viewer
2021-09-20 12:30:49 +02:00
bbd5a9c62b
SL-16021 FIXED impostors are creating full detailed shadows
2021-09-17 15:29:00 +03:00
df5127136f
SL-15709: Add Tracy support to viewer
2021-09-03 17:53:43 -07:00
b18f328c08
Merge branch 'DRTVWR-522-maint' into DRTVWR-545-maint-mix
...
# Conflicts:
# indra/newview/llappviewer.cpp
# indra/newview/llappviewerwin32.cpp
# indra/newview/llmachineid.cpp
2021-09-03 00:18:26 +03:00
1536fdd1c3
Merge branch 'DRTVWR-530-maint' of https://bitbucket.org/lindenlab/viewer
2021-08-24 10:47:18 +02:00
638fe87576
Merge branch 'master' into DRTVWR-483
...
# Conflicts:
# indra/newview/llpanelpicks.cpp
# indra/newview/llpanelpicks.h
# indra/newview/llviewerfloaterreg.cpp
2021-07-23 07:10:26 +03:00
2253723705
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-07-21 14:13:23 +02:00
0497e3d8e9
Merge branch 'DRTVWR-522-maint' of https://bitbucket.org/lindenlab/viewer
2021-07-21 13:36:58 +02:00
4c4dfb682a
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-07-21 13:35:31 +02:00
e219b5cb41
Merge branch 'DRTVWR-519' of https://bitbucket.org/lindenlab/viewer
2021-07-21 13:18:06 +02:00
6c8e6f033b
Merge branch 'master' into DRTVWR-521-maint
...
# Conflicts:
# autobuild.xml
# indra/llcommon/llerror.cpp
# indra/llui/llnotifications.h
# indra/newview/llappviewer.cpp
# indra/newview/llappviewermacosx.cpp
2021-07-20 02:48:05 +03:00
8631a7a077
Merge with tip of Master after a Viewer release
2021-07-19 14:35:44 -07:00
3a476a8296
Merge branch 'master' into DRTVWR-530-maint
2021-07-19 22:22:42 +03:00
9873e7bba9
Merge branch 'master' into DRTVWR-527-maint
2021-07-19 22:22:32 +03:00
2ded530f93
Merge branch 'master' into DRTVWR-522-maint
...
# Conflicts:
# doc/contributions.txt
# indra/newview/llappcorehttp.cpp
# indra/newview/llappcorehttp.h
2021-07-19 22:20:45 +03:00
738e5c2659
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-07-15 19:56:26 +02:00
962be69e71
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-07-15 18:19:56 +02:00
44d78f3dbe
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-06-27 16:18:42 +02:00
7b5f815b94
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-06-27 15:01:27 +02:00
96a52bd51f
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-06-25 12:47:11 +02:00
9563ab543b
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-06-25 11:56:38 +02:00
3c1d189bb8
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-06-25 09:26:10 +02:00
8b5fe507a4
Merge branch 'master' into DRTVWR-530-maint
2021-06-25 01:02:15 +03:00
0ca16a1f95
Merge branch 'master' into DRTVWR-527-maint
...
# Conflicts:
# indra/newview/llinventorypanel.cpp
2021-06-25 01:02:04 +03:00
7f19c512c9
Merge branch 'master' into DRTVWR-522-maint
...
# Conflicts:
# indra/newview/app_settings/settings.xml
2021-06-25 00:54:35 +03:00
293272c2c7
Merge branch 'master' into DRTVWR-521-maint
2021-06-25 00:52:03 +03:00
a4c6c7059f
Merge branch 'master' into DRTVWR-516-maint
...
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/llvoicevivox.cpp
2021-06-25 00:51:02 +03:00
57da3e609f
Merge branch 'master' into DRTVWR-519
2021-06-24 14:35:24 -07:00
8e2adbcde7
Merge branch 'DRTVWR-519' of https://bitbucket.org/lindenlab/viewer
2021-06-15 12:04:03 +02:00
6baaef4ee2
Add in the JIRA (SL-15398) describing the contribution from FS:Ansariel to the contributions.txt file
2021-06-14 11:10:22 -07:00
e7cbd00d64
Fix for SL-15382 Update contributions text file in Viewer
2021-06-10 16:51:23 -07:00
11a5604576
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-06-09 08:49:19 +02:00
f8d1834036
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-06-09 08:48:27 +02:00
e48376d29b
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-06-08 17:33:00 +02:00
c1f1b85243
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-06-08 15:39:56 +02:00
ddfb4a5d1b
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-06-08 14:30:18 +02:00
d3815da8b0
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-06-08 10:25:34 +02:00
ad9ed0a94d
Merge with tip of Master after Viewer release
2021-06-07 18:55:00 -07:00
7587f0dd88
Merge branch 'master' into DRTVWR-483
2021-06-07 21:08:43 +03:00
3c40a833ef
Merge branch 'master' into DRTVWR-530-maint
2021-06-07 21:05:04 +03:00
1639e1ceb4
Merge branch 'master' into DRTVWR-527-maint
2021-06-07 21:04:54 +03:00
88ac2812b4
Merge branch 'master' into DRTVWR-522-maint
2021-06-07 21:04:46 +03:00
a4595bdaf2
Merge branch 'master' into DRTVWR-521-maint
...
# Conflicts:
# doc/contributions.txt
2021-06-07 21:04:32 +03:00
e7319fb671
Merge branch 'master' into DRTVWR-518-ui
2021-06-07 21:03:27 +03:00
fef6c1f51e
Merge branch 'master' into DRTVWR-516-maint
2021-06-07 20:54:41 +03:00
ed78b2b938
SL-15234 Fix for linux build of 3p-uriparser by NickyD
...
Linux specific contibution. Should not affect win and darwin. Doesn't include linux build, just an update to ensure changes gets pulled into uriparser's master when viewer gets promoted and to make sure nothing complains about issues with 'head revision'.
2021-05-07 20:57:43 +03:00
f655bb1f27
Merge branch master (DRTVWR-515) into DRTVWR-483
...
# Conflicts:
# indra/newview/CMakeLists.txt
# indra/newview/llpanelpicks.cpp (was replaced with a tab in floater)
2021-05-06 22:13:40 +03:00
83f1830576
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-05-02 14:27:34 +02:00
c516f1fc9a
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-05-02 13:50:45 +02:00
7f91fa0b40
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-05-02 13:15:10 +02:00
42da77402b
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-05-01 00:43:21 +02:00
8afe22531d
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-04-30 23:42:57 +02:00
94534f4c88
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-04-30 23:25:06 +02:00
bc76d48967
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-04-30 09:32:45 +02:00
0fa5fc47a2
Merge branch 'master' into DRTVWR-527-maint
2021-04-30 03:04:47 +03:00
e00edbeb4a
Merge branch 'master' into DRTVWR-522-maint
...
# Conflicts:
# doc/contributions.txt
2021-04-30 03:04:06 +03:00
e5a428f362
Merge branch 'master' into DRTVWR-521-maint
2021-04-30 03:00:32 +03:00
99b99a1b4a
Clean up a merge conflict
2021-04-29 13:45:15 -07:00
3f31901640
Merge master (DRTVWR-515) into DRTVWR-516-maint
...
# Conflicts:
# autobuild.xml
# doc/contributions.txt
# indra/llcommon/llcoros.cpp
# indra/llmessage/llcoproceduremanager.cpp
# indra/newview/llfloaterfixedenvironment.cpp
# indra/newview/llfloaterimsessiontab.cpp
2021-04-29 21:00:25 +03:00
2386125ae0
Merge master into DV525-merge-6.4.19
2021-04-29 11:40:22 -06:00
c54382b760
Merge branch 'master' into DRTVWR-518-ui
...
# Conflicts:
# indra/newview/llfloaterfixedenvironment.cpp
# indra/newview/skins/default/xui/en/strings.xml
2021-04-29 20:04:33 +03:00
41ce0bec35
Merge branch 'DRTVWR-525' of https://bitbucket.org/lindenlab/viewer
2021-04-26 10:55:37 +02:00
b58c15b1bd
SL-15096: Merge SovereignEngineer's fix for SL-14035 regression
2021-04-16 15:34:41 -07:00
7ab897baf0
Merge branch 'DRTVWR-516-maint' of https://bitbucket.org/lindenlab/viewer
2021-04-16 23:05:40 +02:00
56eda0385e
SL-13395 Allow creating outfit folders under My Outfits
2021-04-16 20:37:02 +03:00
885215519d
Merge branch 'DRTVWR-527-maint' of https://bitbucket.org/lindenlab/viewer
2021-04-12 11:56:45 +02:00
8215fff0c2
SL-14717 Ability to trigger left clicks (and more) on animesh objects
...
Contribution by Rohacan Hirons
SL-14717 Follow ups
SL-14717 Using the cached setting in LLToolPie::handleHover()
2021-04-06 23:24:38 +03:00
db72dc7d0f
Merge branch 'DRTVWR-516-maint' of https://bitbucket.org/lindenlab/viewer
2021-04-02 19:33:18 +02:00
c0f28ae362
SL-14927 Some avatar names not resolving
2021-03-18 23:01:04 +02:00
b237c26fbf
Merge branch 'DRTVWR-519' of https://bitbucket.org/lindenlab/viewer
2021-03-10 20:28:57 +01:00
f185e03543
Merge branch 'DRTVWR-516-maint' of https://bitbucket.org/lindenlab/viewer
2021-03-10 16:38:27 +01:00
43fbd41bfd
Revert "SL-14939 Fixed the log spam"
...
This reverts commit b1ab29eeb6
2021-03-09 21:57:41 +02:00
3067f56b1f
Revert "SL-14940 Fixed ignoring custom cache path"
...
This reverts commit 8874647858
2021-03-09 21:57:32 +02:00
ada8ad1bc2
SL-14940 Fixed ignoring custom cache path
2021-03-04 12:49:48 +02:00
87908bab6d
SL-14939 Fixed the log spam
2021-03-04 12:23:57 +02:00
925feaaf95
SL-14941 FIXED Cannot upload large images on the Simplified Cache Viewer.
2021-03-04 12:06:12 +02:00
Ansariel