summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewer.cpp
AgeCommit message (Expand)Author
2009-06-29Merge with viewer-2.0.0-3Bryan O'Sullivan
2009-06-26DEV-34569Palmer Truelson
2009-06-25Merge with SVN login-api-3 branchBryan O'Sullivan
2009-06-24DEV-31980: Extend LLEventDispatcher to handle const as well as non-constNat Goodspeed
2009-06-23Incomplete attempt to clean up Mercurial branch buildNat Goodspeed
2009-06-22Merge with viewer-2.0.0-3 branchBryan O'Sullivan
2009-06-21merge -r 124105-124625 skinning-13 -> viewer-2.0.0-3Steven 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-22svn merge -r121194:121210Adam Moss
2009-05-18Result of svn merge -r119432:120464 svn+ssh://svn/svn/linden/branches/http_da...Aaron Brashears
2009-05-11svn merge -r113003:119136 svn+ssh://svn.lindenlab.com/svn/linden/branches/log...Nat Goodspeed
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-05-04QAR-1476 Combo-merge to trunk: Viewer 1.23 RC0 and Simulator 1.26.3Adam Moss
2009-04-16svn merge -r117314:117337Adam Moss
2009-03-13svn merge -r114093:114412 svn+ssh://svn.lindenlab.com/svn/linden/branches/fea...Christian Goetze
2009-02-18Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 (maint-render...Brad Kittenbrink
2009-02-06svn merge -r109009:109164 svn+ssh://svn.lindenlab.com/svn/linden/branches/vie...Mark Palange
2009-02-06QAR-1202 Mergeme for Viewer font in Russian, Ukrainian (for businessAdam Moss
2009-02-03svn merge -r107016:108767 svn+ssh://svn.lindenlab.com/svn/linden/viewer/viewe...Mark Palange
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-23QAR-1142 merging 1.22 RC0-RC4 changes.Mark Palange
2008-12-10always skip fmod shutdown, instead of just for release builds.Adam Moss
2008-12-02QAR-1040 maint-viewer-11 + OpenAL combo mergemeAdam Moss
2008-11-19QAR-1018 Lightweight Windows Setup App (windows-setup-3). svn merge -r102882:...James Cook
2008-10-28svn merge -r100302:100467 installer-james-combo-merge for QAR-972, incorporat...James Cook
2008-10-08merge r97380-98701 branches/viewer/viewer_1-21 (Viewer RC5 and security fixes...Mark Palange
2008-10-07Roll back of r98854 Accidentally commited merge in progressMark Palange
2008-10-07merge r97380-98701 branches/viewer/viewer_1-21 (Viewer RC5 and security fixes...Mark Palange
2008-09-29QAR-872 Viewer 1.21 RC 3Steven Bennetts
2008-09-23QAR-849 merge maint-viewer-10-merge 96838-97237 -> releaseSteven Bennetts
2008-09-12QAR-855 Viewer 1.21 RC 2Steven Bennetts
2008-09-05svn merge -r95288:95907 svn+ssh://svn.lindenlab.com/svn/linden/qa/maint-serve...Andrew Meadows
2008-08-28merge viewer/viewer_1-21 94170-94770 -> releaseSteven Bennetts
2008-08-13QAR-782 Merge featurettes batch #2Steven Bennetts
2008-08-12QAR-767 Combined maint-render-7 and maint-viewer-9 mergeSteven Bennetts
2008-07-23DEV-18283 Remove nonsense mem-checking debug codeBrian McGroarty
2008-07-22QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> ReleaseSteven Bennetts
2008-07-03simple crash fix if someone creates a bad command line. fallout from string c...Aaron Brashears
2008-06-30Merging in file-move-merge ( QAR-649 )Eric Tulla
2008-06-27QAR-669 1.20 Viewer RC11Steven Bennetts
2008-06-26QAR-628 merge string-cleanup-5 -r 90476:90508 -> releaseSteven Bennetts
2008-06-06svn merge -r 88872:89137 svn+ssh://svn.lindenlab.com/svn/linden/qa/qar-652 --...Josh Bell
2008-06-06QAR-650 - Viewer RC 9 merge -> release (post cmake)Steven Bennetts
2008-06-02svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake...Bryan O'Sullivan
2008-05-19EFFECTIVE MERGES:Don Kjer
2008-05-14Result of svn merge -r 87455:87538 $SVN/branches/tulla/vc3-merge .Eric Tulla
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-23 17:22:51 +0000