summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermedia.cpp
AgeCommit message (Expand)Author
2009-10-01svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/me...Monroe Williams
2009-09-18Merged latest viewer/viewer-20 into login-api.brad kittenbrink
2009-09-09merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/g...Richard Nelson
2009-08-27Merged latest login-api with latest viewer-2.0.0-3 up through plugin-api-05 m...brad kittenbrink
2009-08-27svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/mo...Monroe Williams
2009-07-30Merged in viewer-2.0.0-3 changes up through r129050. Boost got clobbered so ...brad kittenbrink
2009-07-29DEV-35405 Added creation of <exe_dir>/components directory in debug builds to...Mark Palange (Mani)
2009-07-21merge https://svn.aws.productengine.com/secondlife/pe/stable-1/indra -r 1078-...Steven Bennetts
2009-07-10merge QAR-1579: texture-cleanup-1.Xiaohong Bao
2009-07-08merge -r 889-936 https://svn.aws.productengine.com/secondlife/pe/stable/ -> v...Steven Bennetts
2009-06-21merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3Steven Bennetts
2009-06-04Merge of QAR-1383 event-system-7 into trunk.Brad Kittenbrink
2009-05-08svn merge -r114679:114681 svn+ssh://svn.lindenlab.com/svn/linden/branches/eve...Nat Goodspeed
2009-05-08merge trunk@116587 skinning-7@119389 -> viewer-2.0.0-skinning-7Steven Bennetts
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
2008-12-23QAR-1142 merging 1.22 RC0-RC4 changes.Mark Palange
2008-09-12QAR-855 Viewer 1.21 RC 2Steven Bennetts
2008-08-12QAR-767 Combined maint-render-7 and maint-viewer-9 mergeSteven Bennetts
2008-07-23svn merge -r92720:92721 svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-pi...Karl Steifvater
2008-07-22svn merge -r92710:92709 svn+ssh://svn.lindenlab.com/svn/linden/release --> re...Josh Bell
2008-07-22merge uv-picking branch.Karl Steifvater
2008-07-22QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> ReleaseSteven Bennetts
2008-07-18merge support-featurettes-snapshot-merge-2 for QAR-754, includes:James Cook
2008-06-26QAR-628 merge string-cleanup-5 -r 90476:90508 -> releaseSteven Bennetts
2008-04-031.19.1 Viewer merge: QAR_367, QAR-374, QAR-408, QAR-426Steven Bennetts
2008-03-20merge release@82383 viewer-cleanup2-7-merge@82828Steven Bennetts
2008-03-15reverting premature commit at 82410.Steven Bennetts
2008-03-14[NOTE: This was an erroneous commit, and was reverted in the next revision]Mark Palange
2008-02-21Updated header comments with our public license statement that reflects their...Callum Prentice
2008-02-19merge svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r ...Steven Bennetts
2008-02-14svn merge -r 79730:79944 svn+ssh://svn.lindenlab.com/svn/linden/branches/parc...Josh Bell