summaryrefslogtreecommitdiff
path: root/indra/newview/llfilepicker.cpp
AgeCommit message (Collapse)Author
2023-07-17DRTVWR-559 fix for lines lost in the mergeBrad Linden
2023-07-17Merge remote-tracking branch 'origin/main' into DRTVWR-559Brad Linden
2023-05-19DRTVWR-580 Post-merge fix - unused codeAndrey Lihatskiy
2023-05-17Merge remote-tracking branch 'origin/main' into DRTVWR-559Brad Linden
2023-05-17Merge branch 'main' into DRTVWR-580-maint-TAndrey Lihatskiy
# Conflicts: # doc/contributions.txt # indra/llcharacter/llkeyframemotion.cpp # indra/newview/llfilepicker.cpp
2023-03-29Merge remote-tracking branch 'origin/main' into DRTVWR-559Brad Linden
2023-03-30Merge branch 'main' into DRTVWR-580-maint-TAndrey Lihatskiy
2023-03-30Merge branch 'main' into DRTVWR-577-maint-SAndrey Lihatskiy
# Conflicts: # indra/cmake/CMakeLists.txt # indra/newview/skins/default/xui/es/floater_tools.xml
2023-03-20Merge branch 'DRTVWR-568' into DRTVWR-573-maint-RAndrey Lihatskiy
# Conflicts: # indra/cmake/Copy3rdPartyLibs.cmake # indra/cmake/FindOpenJPEG.cmake # indra/cmake/OpenJPEG.cmake # indra/integration_tests/llui_libtest/CMakeLists.txt # indra/newview/CMakeLists.txt
2023-03-03SL-19316 fix filter for GLTF materials on mac (#101)Maxim Nikolenko
2023-02-23SL-19252 Remove "#ifdef _CORY_TESTING" codeMaxim Nikolenko
2023-02-09Merge branch 'main' into DRTVWR-577-maint-SAndrey Kleshchev
# 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-02Merge remote-tracking branch 'origin/main' into DRTVWR-559Brad Linden
2023-01-27SL-18996 make MacOS picker dialogs modeless to avoid disconnects #2Andrey Kleshchev
2023-01-27SL-18996 [WIP] MacOS make picker dialogs non-modal to avoid disconnects #1Andrey Kleshchev
2023-01-06SL-18741 Add gltf to bulk uploads on macAndrey Kleshchev
And cleaned up dupplicate mScale code
2022-12-02SL-18741 Basic bulk upload for gltf materials #1Andrey Kleshchev
2022-10-28Fix leaks in mac filepicker codeRye Mutt
2022-08-24SL-17653 File filter for local materials and textures in texture pickerAndrey Kleshchev
2022-06-23SL-17653 Flip imported GLTF textures, remove .dae and .glb/.gltf from file ↵Dave Parks
dialogs that don't support them
2022-06-15SL-17605 WIP - Upload->Material now lets you pick a GLTF file and imports ↵Dave Parks
the first material in the GLTF file to the Material Editor
2022-06-08SL-17214 initial loader class skeletonDave Houlton
2022-04-18Another instance where LLFilePicker::getSaveFile had the wrong number of ↵Nicky
arguments.
2022-04-18Add argument missing from implementationNicky
2020-10-08DRTVWR-510 remove all LL_SOLARIS conditionalsDave Houlton
2018-12-19SL-10155 FIXED [MAC] Mesh upload tries to upload folder instead of opening itMnikolenko ProductEngine
2018-04-17MAINT-8325 Fixed The Save Local dialog disconnects the viewer if you do not ↵andreykproductengine
choose the save directory files within the first minute
2017-11-22MAINT-1804 Fixed bulk upload failures due to non-ansi symbols in namesandreykproductengine
2017-05-26MAINT-1139 Catch Windows crash on Saving snapshotandreykproductengine
2016-04-04merge with 4.0.3-releaseOz Linden
2015-11-10remove execute permission from many files that should not have itOz Linden
2015-09-16MAINT-5507: Include httpconstants in file picker for linux.Rider Linden
2014-08-31OPEN-268 - Add missing xml cases to file picker on linux and darwinCinder
2014-06-17Pull merge from lindenlab/viewer-releaseMerov Linden
2014-05-19Pull merge from lindenlab/viewer-releaseMerov Linden
2014-05-19mergeBrad Payne (Vir Linden)
2014-05-13sunshine-external merge WIPBrad Payne (Vir Linden)
2014-05-07Pull and merge viewer-release as version 3.7.8simon
2014-05-06Pull merge from lindenlab/viewer-release. Fixed some conflicts and compile ↵Merov Linden
errors
2014-01-24MAINT-3642 FIXED Allow saving textures with extension “.tga” at the end ↵maxim@mnikolenko
of the name.
2014-01-14MAINT-3262 FIXED Allow uploading gif-imagesMnikolenko ProductEngine
2013-12-18Fix FFLOAD_ALL issue in file picker, add FFLOAD_EXE to fix exe picking on ↵Merov Linden
Mac Cocoa
2013-12-05mergeBrad Payne (Vir Linden)
2013-12-05MAINT-3262 FIXED Cannot select image to upload to Web profileMnikolenko ProductEngine
2013-11-11Automated merge with http://bitbucket.org/lindenlab/viewer-releaseRichard Linden
2013-10-16mergeBrad Payne (Vir Linden)
2013-10-08merge from viewer-releaseRichard Linden
2013-09-10BUG-3848: send_agent_resume() was not being called after snapshot.Cinder Biscuits
2013-09-10mergeBrad Payne (Vir Linden)
2013-09-09merge with viewer-releaseRichard Linden
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-27 15:19:10 +0000