summaryrefslogtreecommitdiff
path: root/indra/newview/llfilepicker.h
AgeCommit message (Collapse)Author
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
2008-06-26QAR-628 merge string-cleanup-5 -r 90476:90508 -> releaseSteven Bennetts
dataserver-is-deprecated
2007-10-04Result of svn merge -r71162:71205 ↵Aaron Brashears
svn+ssh://svn/svn/linden/branches/new-license into release. only changes files which are not deployed or the comments section of code.
2007-09-10SL-53811, SL-53812, SL-53823, SL-26604, SL-54282 Linux filepickersAdam Moss
revamp. Passed by QA. Reviewed by bos. svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@68938 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/SL-26604-based-on-r68938 -> release
2007-03-02merge release@58699 beta-1-14-0@58707 -> releaseSteven Bennetts
2007-02-02Result of svn merge -r57264:57370 ↵Aaron Brashears
svn+ssh://svn/svn/linden/branches/adroit.r40-68 into release.
2007-01-02Print done when done.James Cook
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 00:08:53 +0000