aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llviewermenufile.cpp (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'weekly' into webkit_pluginsAleric Inglewood2010-10-221-0/+32
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: linden/indra/cmake/GStreamer.cmake linden/indra/cmake/GStreamer.cmake was deleted: we're going to try to use system libs, so any improvements that have been made in weekly have been invane. linden/indra/newview/llstartup.cpp Trivial #include collision. One include added another removed. Fixed. linden/indra/newview/lltoolpie.cpp Collision with RLV, pretty trivial. Fixed. linden/indra/newview/viewer_manifest.py Trivial White space fix collision with commenting out of gstreamer libs. Fixed.
| * Added support for upload and local usage of PSD (Photoshop, including layers ↵elektrahesse2010-10-131-0/+32
| | | | | | | | and native transparency) and TIFF images (including alpha channel) on any Intel Mac using native Quartz/vImage routines
* | Merge branch 'mccabe-plugins' into plugins_mergeRobin Cornelius2010-10-101-1/+1
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: linden/doc/contributions.txt linden/indra/cmake/GStreamer.cmake linden/indra/cmake/LLMedia.cmake linden/indra/cmake/OPENAL.cmake linden/indra/llmedia/CMakeLists.txt linden/indra/llprimitive/material_codes.h linden/indra/newview/chatbar_as_cmdline.cpp linden/indra/newview/llappviewer.cpp linden/indra/newview/llfloatertos.cpp linden/indra/newview/llstartup.cpp linden/indra/newview/llviewerwindow.cpp linden/indra/newview/llvoavatar.cpp linden/indra/newview/pipeline.cpp linden/indra/newview/pipeline.h linden/indra/newview/viewer_manifest.py linden/install.xml
| * llmediaplugins first stepArmin Weatherwax2010-09-231-1/+1
| |
* | Preview temporary textures on upload (by Henri Beauchamp from the Cool ↵McCabe Maxsted2010-10-021-1/+4
|/ | | | Viewer). TODO: add 'temporary' to the window title for temp textures
* correct capitalization of error message keyNemurimasu Neiro2010-08-281-1/+1
|
* bulk upload supports .png tooNemurimasu Neiro2010-08-281-1/+1
|
* Added minimize all option to the File menu, works on everything but the ↵McCabe Maxsted2010-06-191-0/+10
| | | | snapshot window (decided that was a feature)
* Ported temporary texture uploads from Emerald.Armin Weatherwax2010-03-041-14/+61
|
* Ported many APR changes from Snowglobe.Jacek Antonelli2010-02-081-1/+1
|
* Merged working branch of 1.2 into LL 1.23 mergeMcCabe Maxsted2009-10-181-5/+10
|\
| * BROKEN logoff/relog crashing inconsistently on various startup states.Armin Weatherwax2009-07-111-5/+10
| |
* | Second Life viewer sources 1.23.0-RCJacek Antonelli2009-04-301-77/+111
|/
* Second Life viewer sources 1.22.5-RCJacek Antonelli2009-01-111-1/+1
|
* Second Life viewer sources 1.22.4-RCJacek Antonelli2009-01-111-1/+2
|
* Second Life viewer sources 1.22.3-RCJacek Antonelli2008-12-121-0/+5
|
* Second Life viewer sources 1.22.0-RCJacek Antonelli2008-12-011-9/+9
|
* Second Life viewer sources 1.21.0-RCJacek Antonelli2008-09-061-123/+155
|
* Second Life viewer sources 1.20.14Jacek Antonelli2008-08-151-4/+1
|
* Second Life viewer sources 1.20.7Jacek Antonelli2008-08-151-29/+22
|
* Second Life viewer sources 1.20.2Jacek Antonelli2008-08-151-21/+11
|
* Second Life viewer sources 1.19.1.0Jacek Antonelli2008-08-151-13/+2
|
* Second Life viewer sources 1.19.0.0Jacek Antonelli2008-08-151-10/+4
|
* Second Life viewer sources 1.18.6.4-RCJacek Antonelli2008-08-151-1/+1
|
* Second Life viewer sources 1.18.6.0-RCJacek Antonelli2008-08-151-2/+14
|
* Second Life viewer sources 1.18.4.0-RCJacek Antonelli2008-08-151-1/+4
|
* Second Life viewer sources 1.18.3.2-RCJacek Antonelli2008-08-151-1/+1
|
* Second Life viewer sources 1.18.1.2Jacek Antonelli2008-08-151-5/+11
|
* Second Life viewer sources 1.18.0.6Jacek Antonelli2008-08-151-1/+2
|
* Second Life viewer sources 1.17.3.0Jacek Antonelli2008-08-151-1/+1
|
* Second Life viewer sources 1.17.1.0Jacek Antonelli2008-08-151-0/+15
|
* Second Life viewer sources 1.15.1.3Jacek Antonelli2008-08-151-0/+1022