summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermenufile.cpp
AgeCommit message (Expand)Author
2010-07-14mergeDave Parks
2010-06-15merge fix in unrelated file.Tofu Linden
2010-06-15merge backout.Tofu Linden
2010-06-15Backed out changeset 1c66b34b7fbeTofu Linden
2010-06-10Add "LL_MESH_ENABLED" preprocessor flag for toggling mesh code. Couple of me...Dave Parks
2010-06-08Merge cleanup.Dave Parks
2010-06-07Merge with render-pipelineDave Parks
2010-05-21VI-65 - Addition of Quick/Eazy Buy Web based floater.Callum Prentice
2010-05-11Hide mesh UI when MeshEnabled is set to false.Dave Parks
2010-04-06another hairy merge from viewer-trunk :(Tofu Linden
2010-04-01make LLImageBase::allocateData() thread-safe.Xiaohong Bao
2010-03-30HUGE merge from viewer-trunk. Many conflicts resolved.Tofu Linden
2010-03-25automated mergeLoren Shih
2010-03-24MergeLeyla Farazha
2010-03-24Hooked up Save As Profile PicLeyla Farazha
2010-03-23EXT-2959 : Full out camera functions from llagent to llagentcameraLoren Shih
2010-03-20mergeDave Parks
2010-03-18(EXT-5982) [FRAGMENTATION] L$ kaufen window (Buy L$)Sergei Litovchuk
2010-03-16Implemented normal task EXT-5982([HARD CODED] on L$ kaufen window (Buy L$)).Andrew Dyukov
2010-03-12Fix for file dialog crashing on mac and linux when uploading meshes.Dave Parks
2010-03-08little boolDave Parks
2010-03-08Multi-threaded file dialogDave Parks
2010-03-01"Model..." upload button always enabled now.Dave Parks
2010-02-28Remove some dead code.Dave Parks
2010-02-11merge from viewer2 trunk.Tofu Linden
2010-02-11CIT-76Tofu Linden
2010-01-07Backed out changeset: 0e0f8b0b0fa8Dave Parks
2010-01-06LLImportCollada no longer a singleton to prepare for subclassing.Dave Parks
2009-12-18Merge with viewer-2-0Dave Parks
2009-12-17dos2unix line ending fix for llviewermenufile.cppLoren Shih
2009-12-14Merge of my old precompiled headers dependency cleanup with tip of viewer-2-0.brad kittenbrink
2009-12-14Merging in latest viewer 2Palmer Truelson
2009-12-09Fix for EXT-2703 & EXT-2708 - save texture as issuesEric M. Tulla (BigPapi)
2009-12-07Merge of viewer 2 changesPalmer
2009-11-25Created lightweight LLNotificationsUtil::add(), switched most alerts to use itJames Cook
2009-11-24Removed include llnotifications.h from llfloater.h trying to speed buildsJames Cook
2009-11-18Fixed variable price upload path.Jonathan@Chomp.lindenlab.com
2009-11-17Automated merge with ssh://palmer@hg.lindenlab.com/viewer/viewer-2-0Palmer
2009-11-13Refactoring of llviewerprecompiledheaders.h to hopefully increase stabilitybrad kittenbrink
2009-11-12CTS-15 Force loading of high LOD when opening model import floater.Dave Parks
2009-11-11Merged in viewer 2 changes, adjusted xui problems, added mesh folder type and...Palmer
2009-11-10Sanitize naming of getWindowRect (scaled vs. raw pixels) and getWorldViewRect...James Cook
2009-11-09super importer stuff (gui, texture upload, etc.)Karl Stiefvater (qarl)
2009-11-04Redo Bao's broken mergeBryan O'Sullivan
2009-11-03Changed variable price upload responders to reflect server changes. I hope t...Jon Wolk
2009-11-02Sync up with render-pipeline-7 ignore-dead-branchDavid Parks
2009-10-14Merge a big bunch of fixes from maint-viewer. Hooray.Adam Moss
2009-08-27svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/mo...Monroe Williams
2009-08-04svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/sk...Richard Nelson
2009-07-10merge QAR-1579: texture-cleanup-1.Xiaohong Bao