summaryrefslogtreecommitdiff
path: root/indra/newview/llassetuploadresponders.cpp
AgeCommit message (Expand)Author
2011-07-18mergeDave Parks
2011-07-13mergeBrad Payne (Vir Linden)
2011-07-11merge changes for storm-1325Oz Linden
2011-07-01SH-1790 FIX - use the inventory flags returned by server when availableBrad Payne (Vir Linden)
2011-06-15FIX STORM-1325 Retry bake uploads in case of upload failureThickbrick Sleaford
2011-05-30SH-1677 FIXED [REGRESSION] Bulk uploads do not adhere to default permissionsSeraph Linden
2011-01-10Automated merge up from viewer-developmentLoren Shih
2011-01-07VWR-1095 fix for problems with uploads following bulk upload failureCoaldust Numbers
2010-10-13correct licenses (fix problem with license change merge)Oz Linden
2010-09-28Missed a file from last commit.Dave Parks
2010-09-28SH-238 Add check boxes to upload skin weights (or not) and/or joint positions...Dave Parks
2010-09-27mergeDave Parks
2010-09-22Remove LL_MESH_ENABLED macros (fixes drag and drop). Add mesh stitching type...Dave Parks
2010-09-21Fix for build failures - disabling tcmalloc for nowBrad Payne (Vir Linden)
2010-08-13Change license from GPL to LGPL (version 2.1)Oz 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-07Merge with render-pipelineDave Parks
2010-05-21VI-65 - Addition of Quick/Eazy Buy Web based floater.Callum Prentice
2010-04-06YET another hairy merge from viewer-trunk. Conflicts resolved... so far.Tofu Linden
2010-04-05EXT-6703 : LLInventory.h cleanup and create new LLInventoryDefinesLoren Shih
2010-03-30HUGE merge from viewer-trunk. Many conflicts resolved.Tofu Linden
2010-03-29For EXT-4666: changed LLGestureManager to LLGestureMgr throughoutBrad Payne (Vir Linden)
2010-03-24MergeLeyla Farazha
2010-03-24Hooked up Save As Profile PicLeyla Farazha
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-05Inventory now updates appropriately when using model uploader.Dave Parks
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-11implemented EXT-2323 “Get rid from obsolete notification widgets”;Alexei Arabadji
2009-12-07fix of another merge borkasaurusPalmer Truelson
2009-12-07Fixing merge borkasaurs.Palmer
2009-12-07Merge of viewer 2 changesPalmer
2009-12-01EXT-3028 : "Find Original" does nothing if floater inventory isn't openLoren Shih
2009-11-25retry asset upload failures.Karl Stiefvater (qarl)
2009-11-25Created lightweight LLNotificationsUtil::add(), switched most alerts to use itJames Cook
2009-11-24Removed llnotifications.h from all headers by adding llnotificationsptr.hJames 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-13Header file cleanupLoren Shih
2009-11-11Merged in viewer 2 changes, adjusted xui problems, added mesh folder type and...Palmer
2009-11-09super importer stuff (gui, texture upload, etc.)Karl Stiefvater (qarl)
2009-11-06merge from texture-pipelineSteve Bennetts
2009-11-06merge QAR-1829: texture pipeline branch in viewer-2.0.0.3Xiaohong Bao
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