summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatertos.cpp
AgeCommit message (Expand)Author
2009-11-25Created lightweight LLNotificationsUtil::add(), switched most alerts to use itJames Cook
2009-11-24Removed include llnotifications.h from llfloater.h trying to speed buildsJames Cook
2009-09-11QAR-1619: Reconcile LLFloaterTOS::onCancel() with viewer-2 version.Nat Goodspeed
2009-09-01Merged login-api with viewer-2.0.0-3 up through r132290.brad kittenbrink
2009-08-28DEV-38942 Eliminate startModal() from LLModalDialogSteven 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-24merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3Richard Nelson
2009-08-11Better solution for fixing up the LLFloaterTOS callback after the last viewer...brad kittenbrink
2009-08-06Merged in partial rollback of LLFloaterTOS post-merge fixes.brad kittenbrink
2009-08-06Backed out changeset bfb246df4655: rolling back LLFloaterTOS post-merge fixup...brad kittenbrink
2009-08-05Fixups after the latest merge with viewer-2.0.0-3. Updated LLLoginInstance t...brad kittenbrink
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-22Adding LLLoginInstance unit testMark Palange (Mani)
2009-06-21merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3Steven Bennetts
2009-05-11svn merge -r113003:119136 svn+ssh://svn.lindenlab.com/svn/linden/branches/log...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
2009-01-05svn merge -r106715:HEAD svn+ssh://svn.lindenlab.com/svn/linden/branches/q/not...Kent Quirk
2008-08-13QAR-782 Merge featurettes batch #2Steven Bennetts
2008-06-26QAR-628 merge string-cleanup-5 -r 90476:90508 -> releaseSteven Bennetts
2008-06-06QAR-650 - Viewer RC 9 merge -> release (post cmake)Steven Bennetts
2008-04-01merge release@83343 skinning-1-merge@83714 -> releaseSteven Bennetts
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
2007-11-07merge svn+ssh://steve@svn/svn/linden/branches/viewer-cleanup-3 -r 73026:73079Steven Bennetts
2007-10-04Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-licen...Aaron Brashears
2007-08-21EFFECTIVE MERGE: svn merge -r 66133:68118 svn+ssh://svn/svn/linden/branches/m...Christian Goetze
2007-05-04svn merge -r 61148:61343 svn+ssh://svn/svn/linden/branches/maintenance into r...Don Kjer
2007-05-01svn merge -r 59163:61099 svn+ssh://svn/svn/linden/branches/release-candidate ...Don Kjer
2007-03-16merge -r 59028:59178 maintenance -> release.Steven Bennetts
2007-03-14svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@59161 svn+ssh://svn....Josh Bell
2007-02-24svn merge -r 58007:58273 svn+ssh://svn.lindenlab.com/svn/linden/branches/main...Richard Nelson
2007-01-10svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@56631 svn+ssh://svn....Jon Wolk
2007-01-08svn merge -r 56431:56560 svn+ssh://svn.lindenlab.com/svn/linden/branches/main...Josh Bell
2007-01-02Print done when done.James Cook