summaryrefslogtreecommitdiff
path: root/indra/newview/llstartup.cpp
AgeCommit message (Expand)Author
2009-10-03Merge inspectors UI project, gooey-4, into viewer-2 trunk. Added new tooltip...James Cook
2009-10-02QAR-1619: need to help Linux gcc figure out LLSD-to-string assignmentNat Goodspeed
2009-10-02Patches follow merge to latest viewer-20 updatesMark Palange (Mani)
2009-10-02merge of latest viewer/viewer-20Mark Palange (Mani)
2009-09-30QAR-1619: merge up to 2009-09-26 viewer/viewer-20Nat Goodspeed
2009-09-30DEV-35039 Viewer 2.0 Help System - Viewer DevelopmentAdam Moss
2009-09-24Merging down avatar-pipeline/currently-worn-folder-8. Includes fixes for EXT...Bradley Payne
2009-09-22Merging render-pipeline-6-qa-2 into viewer-2David Parks
2009-09-18Merged latest viewer/viewer-20 into login-api.brad kittenbrink
2009-09-14DEV-38598: More closely align new login-failure control flow with viewer-2.Nat Goodspeed
2009-09-10For DEV-34223: Avatar Pipeline Project - M6 (Current Outfit Folder, Appearanc...Bradley Payne
2009-09-07merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@...Steven Bennetts
2009-09-01Merged login-api with viewer-2.0.0-3 up through r132290.brad kittenbrink
2009-08-31Post-merge cleanups (ported llstartup.cpp changes to where the surrounding co...brad kittenbrink
2009-08-28svn merge -r 1490-1500 https://svn.aws.productengine.com/secondlife/pe/stable-2Steven Bennetts
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-08-26svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-...Steven Bennetts
2009-08-26DEV-37428 - add adult_compliant flag to startup sequence so that 2.x viewer p...Kent Quirk
2009-08-24Make setStartupState() fling events on "StartupState" LLEventPumpNat Goodspeed
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-14svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-...Steven Bennetts
2009-08-04Merged in latest viewer-2.0.0-3 up through svn r129410. LLFloaterTOS needs s...brad kittenbrink
2009-08-04svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/sk...Richard Nelson
2009-07-31Fixups for conflicts that got dropped in the changeset 486d51877332 merge of ...brad kittenbrink
2009-07-30Merged in viewer-2.0.0-3 changes up through r129050. Boost got clobbered so ...brad kittenbrink
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-24Adding LLLoginInstance unit test.Mark Palange (Mani)
2009-07-22Adding LLLoginInstance unit testMark Palange (Mani)
2009-07-10merge QAR-1579: texture-cleanup-1.Xiaohong Bao
2009-07-10EXT-70 Camera and Movement controls don't save their positionsSteven Bennetts
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-24two more llstartup.cpp merge issues.Mark Palange (Mani)
2009-06-24Commiting merged llstartup.cpp, again?Mark Palange (Mani)
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-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-20svn merge -r113004:115000 svn+ssh://svn.lindenlab.com/svn/linden/branches/ser...Dave Simmons
2009-03-13svn merge -r114093:114412 svn+ssh://svn.lindenlab.com/svn/linden/branches/fea...Christian Goetze
2009-03-06Trivial stub installer cleanup - resized the dialog, pointed at final URL for...James Cook
2009-02-18Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 (maint-render...Brad Kittenbrink
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-15svn merge -r105329:105903 svn+ssh://svn/svn/linden/branches/featurettes/featu...Melinda Green