summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerfloaterreg.cpp
AgeCommit message (Collapse)Author
2023-02-02Merge remote-tracking branch 'origin/main' into DRTVWR-559Brad Linden
2022-12-12Merge remote-tracking branch 'origin/main' into DRTVWR-559Brad Linden
2022-12-12Merge branch 'main' into DRTVWR-570-maint-QAndrey Lihatskiy
# Conflicts: # doc/contributions.txt # indra/newview/app_settings/shaders/class1/deferred/materialF.glsl # indra/newview/llfloater360capture.cpp
2022-11-01SL-18448 Modified Material Editor to match overrides betterAndrey Kleshchev
2022-10-11SL-18165 Mac build fixAndrey Kleshchev
2022-10-11SL-18165 Tighten up some command permissionsAndrey Kleshchev
2022-09-13SL-18137 Open self profile when using app/openfloater/profileMnikolenko Productengine
2022-08-31Merge branch 'master' into DRTVWR-565-maint-PAndrey Lihatskiy
# Conflicts: # indra/newview/llfloateroutfitsnapshot.cpp
2022-08-31Merge branch master (DRTVWR-483) into DRTVWR-559Andrey Kleshchev
# Conflicts: # indra/newview/lllocalbitmaps.cpp # indra/newview/lllocalbitmaps.h # indra/newview/llviewerregion.cpp # lllocalgltfmaterials.* were modified to match lllocalbitmaps*
2022-08-30Merge remote-tracking branch 'remotes/origin/DRTVWR-563' into DRTVWR-559Dave Parks
2022-07-19SL-17670 Simplify outfit snapshot floaterMnikolenko Productengine
2022-06-14SL-17586 WIP -- LLMaterialEditor prototype and "New Material" inventory buttons.Dave Parks
2022-05-31SL-17490 Only update a subset of textures each frame and remove dead debug code.Dave Parks
2022-05-31SL-15312 Tweaks and fixesAndrey Kleshchev
- Allowed resizing text fields for classifieds in profiles - Fixed mislabeled floater from picks to classifieds - Fixed classified floater's title - Added support to see multiple classifieds - Removed obsolete panels - Fixed pick requests for various menus - Fixed pick creation from landmarks - Improved online status handling - Updated headers in files
2022-05-26Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
# Conflicts: # indra/newview/llviewertexturelist.cpp
2021-12-26Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
2021-12-15DRTVWR-546 merge up to 6.5.2Dave Houlton
2021-09-29SL-15999 - don't create floaters in noninteractive modeBrad Payne (Vir Linden)
2021-08-20DRTVWR-534: Batch of modifications to 360 capture project after moving from ↵Callum Prentice
internal repo to public one.
2021-07-23Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
# Conflicts: # indra/newview/llpanelpicks.cpp # indra/newview/llpanelpicks.h # indra/newview/llviewerfloaterreg.cpp
2021-06-09SL-15363 how_to on older viewers is forced to persistAndrey Kleshchev
Older how_to floater is not set to persist in between sessions and gets stuck, ranamed new how_to into guidebook to avoid the issue
2021-04-16SL-15028 Move guidebook code into own flaoterAndrey Kleshchev
To help with dispatcher and unify code
2021-03-23SL-14900 new Landmark creation flowMnikolenko Productengine
2020-09-23SL-13335 Friendlier L$ Buy flow when no payment method on fileMnikolenko Productengine
2020-05-19Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
2020-04-26Merge branch 'master' into DRTVWR-460Andrey Lihatskiy
# Conflicts: # indra/llmath/llquaternion.h # indra/newview/lldrawpoolwater.cpp # indra/newview/lljoystickbutton.cpp # indra/newview/llvosky.cpp # indra/newview/skins/default/textures/textures.xml
2020-04-21Post-merge build fixAndrey Lihatskiy
2020-04-21Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
# Conflicts: # indra/newview/CMakeLists.txt # indra/newview/llviewerfloaterreg.cpp # indra/newview/skins/default/xui/de/floater_preview_texture.xml # indra/newview/skins/default/xui/es/floater_preview_texture.xml # indra/newview/skins/default/xui/fr/floater_preview_texture.xml # indra/newview/skins/default/xui/it/floater_preview_texture.xml # indra/newview/skins/default/xui/ja/panel_edit_classified.xml # indra/newview/skins/default/xui/ja/panel_me.xml # indra/newview/skins/default/xui/ru/floater_preview_texture.xml # indra/newview/skins/default/xui/tr/floater_picks.xml # indra/newview/skins/default/xui/tr/floater_preview_texture.xml # indra/newview/skins/default/xui/tr/panel_edit_classified.xml # indra/newview/skins/default/xui/tr/panel_me.xml # indra/newview/skins/default/xui/zh/floater_preview_texture.xml
2020-02-07SL-10675 More leftovers cleanupAndrey Lihatskiy
=
2020-02-05Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
2020-02-05Merge branch 'master' into DRTVWR-460Andrey Lihatskiy
2020-01-28DRTVWR-440, merge in latest from 6.3.7 releaseDave Houlton
2020-01-08SL-12510 Revert changes and separate 'Save Graphic Preset' floaterMnikolenko Productengine
2019-12-16Merge viewer-release 6.3.6 into viewwer-eep repoDave Houlton
2019-12-13Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2019-12-13Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2019-11-27Merged in pe_devs/494-wassailAndreyL ProductEngine
2019-11-13SL-11964 Removed SL Share from the viewerAndreyL ProductEngine
2019-11-08SL-12186 WIP Add new 'My camera presets' floatermaxim_productengine
2019-09-10Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2019-09-10Merge viewer-release 6.3.2Graham Linden
2019-09-10Merge viewer-release 6.3.2Graham Linden
2019-08-09SL-9699 Login selectionandreykproductengine
2019-05-08Fix merge fail.Graham Linden
2019-05-08Merged in lindenlab/viewer-releaseAndreyL ProductEngine
2019-05-08Merge 6.2.2Graham Linden
2019-05-08Merge viewer-releaseGraham Linden
2019-04-17Merge 6.2.1Graham Linden
2019-04-17Merge 6.2.1Graham Linden
2019-04-17Merged in lindenlab/viewer-releaseAndreyL ProductEngine
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 00:44:30 +0000