summaryrefslogtreecommitdiff
path: root/indra/newview/llfilepicker.h
AgeCommit message (Collapse)Author
2024-05-15Manual whitespace fixes (fix_whitespace.py).Nat Goodspeed
2024-01-04DRTVWR-589: Merge branch 'main' into DRTVWR-589Nat Goodspeed
2023-09-05Initial prototype of embedded LUAMnikolenko Productengine
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-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
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-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
2021-03-09This set of changes reverts the merge with master (git revert c83e740) and ↵Callum Prentice
results in a version of the DRTVWR-519 that matches what was presemt before it was deployed as a release viewer *plus* 3 small fixes from Maxim (See commits). This branch can now be used for additional fixes before eventually being used to release D-519 as normal
2021-03-08Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into ↵Brad Payne (Vir Linden)
DRTVWR-519" This reverts commit e61f485a04dc8c8ac6bcf6a24848359092884d14, reversing changes made to 00c47d079f7e958e473ed4083a7f7691fa02dcd5.
2020-09-16First part of change to remove LLVFS from the Viewer. Consists of code ↵Callum Prentice
changes to remove LLVFS and LLVFSThread classes along with the associated source files. The existing llvfs folder is renamed to llcache. Also includes changes to CMake script in many places to reflect changes. Eventually, llvfile source file and class will be renamed but that is not in this change.
2018-05-31MAINT-8700 Remove obsolete code and update 'Save texture' file dialogmaxim_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
2015-11-10remove execute permission from many files that should not have itOz Linden
2014-10-18Update to build on Xcode 6.0: collection of removal of unused variables ↵callum_linden
[-Wunused-variable]
2014-05-06Pull merge from lindenlab/viewer-release. Fixed some conflicts and compile ↵Merov Linden
errors
2013-12-18Fix FFLOAD_ALL issue in file picker, add FFLOAD_EXE to fix exe picking on ↵Merov Linden
Mac Cocoa
2013-11-11Automated merge with http://bitbucket.org/lindenlab/viewer-releaseRichard Linden
2013-09-09merge with viewer-releaseRichard Linden
2013-09-09Merge downstream code with viewer-releasesimon_linden
2013-08-14MAINT-2897 MAINT-2897 Need to be able to save textures from inventory as PNGdmitrykproductengine
2013-06-05merge with viewer-releaseRichard Linden
2013-05-13Merged with https://bitbucket.org/lindenlab/viewer-betaGeenz
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2013-01-23Recovered changes for dirpicker and filepickerAura Linden
2012-11-16Some Mac header #defines macros like check and equivalent -- gack!!Nat Goodspeed
Given that third-party libraries (such as Boost) can and do use those names, properly namespace-scoped, it's unpardonable to break any such innocent usage with a macro. Given the pervasiveness of the need, introduce a header file with the requisite #undef directives.
2012-06-04STORM-276 Dictionary import functionality and floaterKitty Barnett
2011-11-17STORM-1708 Adding ability to save/load scripts from file.Ima Mechanique
2010-12-13Automated merge up from viewer-developmentLoren Shih
2010-10-13correct licenses (fix problem with license change merge)Oz Linden
2010-09-21EXP-94 Disable local file system accesscallum
2010-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
2010-03-08little boolDave Parks
2010-03-08Multi-threaded file dialogDave Parks
2010-01-28Merge from viewer2 trunk.Tofu Linden
2010-01-26CID-399Tofu Linden
Checker: UNINIT_CTOR Function: LLFilePicker::LLFilePicker() File: /indra/newview/llfilepicker.cpp
2009-12-18Merge with viewer-2-0Dave Parks
2009-12-07Fixups for things broken after the last merge and for the linux build.brad kittenbrink
2009-11-09super importer stuff (gui, texture upload, etc.)Karl Stiefvater (qarl)
2009-11-02Sync up with render-pipeline-7 ignore-dead-branchDavid Parks
2009-04-16svn merge -r117314:117337Adam Moss
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/mv13a-merge-1 QAR-1343 maint-viewer-13a+libcurlexploitfix-3-3 combo merge
2009-01-08Result of svn merge -r107256:107258 ↵Aaron Brashears
svn+ssh://svn/svn/user/phoenix/license_2009_merge into trunk. QAR-1165
2008-12-15svn merge -r105329:105903 ↵Melinda Green
svn+ssh://svn/svn/linden/branches/featurettes/featurettes-batch4-merge Resolving QAR-1051 Merge featurettes batch #4
2008-07-18merge support-featurettes-snapshot-merge-2 for QAR-754, includes:James Cook
* featurettes-4 89061:89589 (which is all of featurettes-1, -2, and -3, and part of -4) * gteam-showstoppers-3 91950:91951 (which is all of gteam-showstoppers-1, -2, and -3) * featurettes-5 92149:92150 (patch for last line of chat text not visible in chat history, DEV-17771) * snapshot-3 91988:91991 (which is all of snapshot-1, -2, and -3) Merging revisions 92190-92387 of svn+ssh://svn.lindenlab.com/svn/linden/branches/support-featurettes-snapshot-merge-2 into release, respecting ancestry * QAR-590 Merge Lock Request for Support Sprint * QAR-627 Merge snapshot improvements * QAR-686 Merge Lock request for Featurettes
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-23 22:32:20 +0000