summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermenufile.h
AgeCommit message (Collapse)Author
2018-05-30MAINT-8700 FIXED The File dialog disconnects the viewer if you do not choose ↵maxim_productengine
upload files within the first minute
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
2016-04-04merge with 4.0.3-releaseOz Linden
2015-11-10remove execute permission from many files that should not have itOz Linden
2015-07-23Remove unused code and llassetuploadresponders files.Rider Linden
2015-07-15LSL Script upload from inventory.Rider Linden
2015-07-07Clean up viewrmenufile into viewrassetuplodRider Linden
2015-07-02Crash on second add to coproc queue.Rider Linden
2015-07-02Adjusting uploadinfo object for expansion.Rider Linden
Commit is prelim to allow merge from selfless.
2015-07-01MAINT-4952: fix NewResourceUploadInfo member initialization list.Nat Goodspeed
2015-06-30Initial checkin for uploading via coroutine.Rider Linden
2013-06-05merge with viewer-releaseRichard Linden
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2012-11-14SH-3406 WIP convert fast timers to lltrace systemRichard Linden
cleaning up build moved most includes of windows.h to llwin32headers.h to disable min/max macros, etc streamlined Time class and consolidated functionality in BlockTimer class llfasttimer is no longer included via llstring.h, so had to add it manually in several places
2011-06-06Removed the old mesh asset upload pipeline. Fixed a problem with spamming ↵Don Kjer
MissingString MacLocale warnings. Reviewed by Dave
2010-10-13correct licenses (fix problem with license change merge)Oz Linden
2010-09-22MergeMatthew Breindel (Falcon)
2010-09-22Remove LL_MESH_ENABLED macros (fixes drag and drop). Add mesh stitching ↵Dave Parks
type back into tools floater.
2010-09-21Fix for build failures - disabling tcmalloc for nowBrad Payne (Vir Linden)
2010-06-10Add "LL_MESH_ENABLED" preprocessor flag for toggling mesh code. Couple of ↵Dave Parks
merge fixes.
2010-03-12Fix for file dialog crashing on mac and linux when uploading meshes.Dave Parks
2010-03-08Multi-threaded file dialogDave Parks
2010-03-05Inventory now updates appropriately when using model uploader.Dave Parks
2010-02-11Multi-threaded asset uploading with proper ordering first draft.Dave Parks
2009-12-18Merge with viewer-2-0Dave Parks
2009-11-13Refactoring of llviewerprecompiledheaders.h to hopefully increase stabilitybrad kittenbrink
and reduce unnecessary dependencies and incredibuild wedging. Hopefully in the long run this will reduce build time. Also cleaned up a lot of header file usage to conform better to the coding standard. reviewed by james and steve.
2009-11-11Merged in viewer 2 changes, adjusted xui problems, added mesh folder type ↵Palmer
and more mesh inventory type info
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 ↵Jon Wolk
this gets pulled into the hg repository
2009-11-02Sync up with render-pipeline-7 ignore-dead-branchDavid Parks
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-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-05-02svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into ↵Don Kjer
release