summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewer.cpp
AgeCommit message (Expand)Author
2009-09-10Header file corrections to let us build without precompiled headers from llpr...James Cook
2009-09-09merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/g...Richard Nelson
2009-09-04DEV-39508 = Show Tools ("Build") menu by defaultSteven Bennetts
2009-09-04Merging the SLURLs Everywhere branch (viewer-2.0.0-slurls-3) intoMartin Reddy
2009-08-29Partial merge of: viewer-2.0.0-3@131138 texture-pipeline-3@131862 -> viewer-2...Steven Bennetts
2009-08-27svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/mo...Monroe Williams
2009-08-24merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3Richard Nelson
2009-08-21svn merge -r130238:130240 svn+ssh://svn.lindenlab.com/svn/linden/branches/lin...Adam Moss
2009-08-04svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/sk...Richard Nelson
2009-08-03merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@...Steven Bennetts
2009-07-30merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0/...Steven Bennetts
2009-07-27Merge xui-army-8 to pick up 2+ weeks of art, colors, and dialog layout changes.James Cook
2009-07-10merge QAR-1579: texture-cleanup-1.Xiaohong Bao
2009-07-09DEV-35112 Renamed colors_def.xml to colors.xml. Reviewed by Richard.Austin Doupnik
2009-07-07Merge skinning-14 to viewer-2, including refactoring many floaters to registe...James Cook
2009-07-06Merge xui-army-5 to viewer-2, includes layout, art, and color changes, also U...James Cook
2009-06-26DEV-34569Palmer Truelson
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-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