summaryrefslogtreecommitdiff
path: root/indra/newview/llfilepicker.cpp
AgeCommit message (Collapse)Author
2013-11-11Automated merge with http://bitbucket.org/lindenlab/viewer-releaseRichard 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-09merge with viewer-releaseRichard Linden
2013-10-04MAINT-3247 FIXED Check that gfilter is not NULL.maxim@mnikolenko
2013-09-26Try all you want multichar constant, but you'll never be a string to me! ↵Graham Madarasz (Graham Linden)
(fix mac build errors from 'curious' filepicker literals)
2013-09-19Merge downstream codesimon_linden
2013-09-09Merge downstream code with viewer-releasesimon_linden
2013-08-14MAINT-2897 Need to be able to save textures from inventory as PNGcallum_linden
2013-08-14MAINT-2897 MAINT-2897 Need to be able to save textures from inventory as PNGdmitrykproductengine
2013-08-09second phase summer cleaningRichard Linden
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-05-13Merged with https://bitbucket.org/lindenlab/viewer-betaGeenz
2013-04-19merge changes for DRTVWR-294Oz Linden
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2013-01-23Recovered changes for dirpicker and filepickerAura Linden
2012-09-19BUILDFIX: enabling the building of the viewer/appearance backend with ↵Nyx Linden
headless mesa
2012-06-15corrected build problem detected on MacOz Linden
2012-06-15STORM-276 Ease-of-use importing of Open Office dictionary extensionsKitty Barnett
2012-06-04STORM-276 Dictionary import functionality and floaterKitty Barnett
2012-03-09merge changes for vmrg-225Oz Linden
2012-02-07STORM-1803 Fix syntax error that the Windows compiler did not complain aboutJonathan Yap
2012-01-29STORM-1803 Adding raw anim file upload supportJonathan Yap
2012-01-23EXT-1836 FIXED Avoid assigning NULL to an std::string.Vadim ProductEngine
2011-12-25Replacing file filter for windows that was mistakenly removed.Ima Mechanique
2011-12-07STORM-1708 Darwin UI additionsIma Mechanique
2011-12-01STORM-1708 Linux UI additionsIma Mechanique
2011-11-23Changes to filter out tabs from file load and to test if loading/saving ↵Ima Mechanique
should be allowed.
2011-11-17STORM-1708 Adding ability to save/load scripts from file.Ima Mechanique
2011-10-11EXP-1275 FIX A UI element or Keyboard shortcut to clear the viewportRichard Linden
Ctrl+Shift+U now toggles UI and hides floaters refactored main_view.xml made all members of llviewerwindow private
2011-02-08Automated merge up from viewer-development into mesh-developmentLoren Shih
2011-02-01STORM-655 FIXED mismatched filter extension in snapshot floater (jpeg vs jpg)paul_productengine
- Added filter "jpg" for "Save As..." dialog so that *.jpg files can be seen as well as *.jpeg.
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-08Mac and linux fix?Dave Parks
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-11-09super importer stuff (gui, texture upload, etc.)Karl Stiefvater (qarl)
2009-11-02Sync up with render-pipeline-7 ignore-dead-branchDavid Parks
2009-06-21merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3Steven Bennetts
ignore-dead-branch
2009-02-03QAR-1177 maint-viewer-12 + uploadfees-viewer combo mergemeAdam Moss
svn merge -r108355:109316 svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/maint-viewer-12-uploadfees-qa108314 Whew.
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-09-23QAR-849 merge maint-viewer-10-merge 96838-97237 -> releaseSteven Bennetts
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
2008-04-031.19.1 Viewer merge: QAR_367, QAR-374, QAR-408, QAR-426Steven Bennetts
QAR_367 (RC1) - merge Branch_1-19-1-Viewer -r 81609 : 81993 -> release QAR-374 (RC2) - merge Branch_1-19-1-Viewer -r 81993 : 82589 -> release QAR-408 (RC3) - merge Branch_1-19-1-Viewer -r 82589 : 83128 -> release QAR-426 (rc4) - merge Branch_1-19-1-Viewer -r 83125 : 83719 -> release (Actual merge: release@83793 Branch_1-19-1-Viewer-merge@83953 -> release)
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-10 10:21:19 +0000