summaryrefslogtreecommitdiff
path: root/indra/newview/llassetuploadresponders.cpp
AgeCommit message (Expand)Author
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
2009-11-03For QAR-2014 : Sandbox for testing FolderTypes [VIEWER]Loren Shih
2009-11-02EXT-1866 : Inventory Side PanelLoren Shih
2009-11-02Sync up with render-pipeline-7 ignore-dead-branchDavid Parks
2009-10-14Merge r135130 for DEV-4476 - Edits to notecards not visible in viewer sessionBrian McGroarty
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-07Merge skinning-14 to viewer-2, including refactoring many floaters to registe...James Cook
2009-06-23Fixed a bunch of missing includes and forward declares. I was trying to benc...James Cook
2009-06-21merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3Steven Bennetts
2009-05-22svn merge -r121194:121210Adam Moss
2009-03-13svn merge -r114093:114412 svn+ssh://svn.lindenlab.com/svn/linden/branches/fea...Christian Goetze
2009-03-05Merging in Avatar Pipeline work for Viewer 1.23 (QAR-1272).Eric Tulla
2009-02-03QAR-1177 maint-viewer-12 + uploadfees-viewer combo mergemeAdam Moss
2009-01-08Result of svn merge -r107256:107258 svn+ssh://svn/svn/user/phoenix/license_20...Aaron Brashears
2009-01-05svn merge -r106715:HEAD svn+ssh://svn.lindenlab.com/svn/linden/branches/q/not...Kent Quirk
2008-12-15svn merge -r105329:105903 svn+ssh://svn/svn/linden/branches/featurettes/featu...Melinda Green
2008-07-31svn merge -r93014:93396 svn+ssh://svn.lindenlab.com/svn/linden/branches/mono-...Dave Hiller
2008-06-26QAR-628 merge string-cleanup-5 -r 90476:90508 -> releaseSteven Bennetts
2008-05-19EFFECTIVE MERGES:Don Kjer
2008-05-07Back out QAR-520 maintenance-7 merge -- svn merge -r 86947:86946 svn+ssh://sv...Brian McGroarty
2008-05-07QAR-520 maintenance-7 merge -- svn merge -r 84923:86093 svn+ssh://svn.lindenl...Brian McGroarty
2008-04-01merge release@83343 skinning-1-merge@83714 -> releaseSteven Bennetts
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-15 05:05:57 +0000