summaryrefslogtreecommitdiff
path: root/indra/newview/llimview.cpp
AgeCommit message (Expand)Author
2009-10-23mergeSteve Bennetts
2009-10-23Merging revisions 2156-2183 of https://svn.aws.productengine.com/secondlife/p...Steven Bennetts
2009-10-21mergeSteve Bennetts
2009-10-22Merging revisions 2129-2144 of https://svn.aws.productengine.com/secondlife/p...Steven Bennetts
2009-10-21Merging revisions 2112-2128 of https://svn.aws.productengine.com/secondlife/p...Steven Bennetts
2009-10-21Merging revisions 2107-2109 of https://svn.aws.productengine.com/secondlife/p...Steven Bennetts
2009-10-19mergeSteve Bennetts
2009-10-19Merging revisions 2046-2068 of https://svn.aws.productengine.com/secondlife/p...Steven Bennetts
2009-10-16merge from latest svn/viewer-2-0 to hg/viewer-2-0Mark Palange (Mani)
2009-10-14merge -r 2014-2032 https://svn.aws.productengine.com/secondlife/pe/stable-2 -...Steven Bennetts
2009-10-09Added safety checks wherever getSpeakerManager() is called.Steven Bennetts
2009-10-08* EXT-1357 - Client gets stuck when invited to a voice call. Incorrect .xml f...Steven Bennetts
2009-10-02merge of latest viewer/viewer-20Mark Palange (Mani)
2009-10-01merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@...Steven Bennetts
2009-09-29merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@...Steven Bennetts
2009-09-18Merged latest viewer/viewer-20 into login-api.brad kittenbrink
2009-09-11merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@...Steven Bennetts
2009-09-09merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/g...Richard Nelson
2009-09-02merge 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-28svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-...Steven Bennetts
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-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-14* Added a few safety checks to LLScrollContainerSteven Bennetts
2009-08-13Merged latest viewer-2.0.0-3 change up through svn r130333 into login-api.brad kittenbrink
2009-08-11svn merge -r 129543-130091 skinning-19 -> viewer-2.0.0-3Steven 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-30Merged in viewer-2.0.0-3 changes up through r129050. Boost got clobbered so ...brad kittenbrink
2009-07-27Merged skinning-17 into viewer-2 for bug fixes. Commented out new IM window ...James Cook
2009-07-21merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0/...Steven Bennetts
2009-07-08merge -r 889-936 https://svn.aws.productengine.com/secondlife/pe/stable/ -> v...Steven 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-22Merge with viewer-2.0.0-3 branchBryan O'Sullivan
2009-06-21merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3Steven Bennetts
2009-05-22DEV-27646 dll linkage for login module.Brad Kittenbrink
2009-05-08merge trunk@116587 skinning-7@119389 -> viewer-2.0.0-skinning-7Steven Bennetts
2009-02-27svn merge -r 113014:113017 svn+ssh://svn.lindenlab.com/svn/linden/branches/me...Monroe Williams
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-09-29QAR-872 Viewer 1.21 RC 3Steven Bennetts
2008-07-22QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> ReleaseSteven Bennetts
2008-06-26QAR-628 merge string-cleanup-5 -r 90476:90508 -> releaseSteven Bennetts
2008-04-30svn merge -r 86190:86191 maint-ui-11-merge (EFFECTIVE MERGE: -r 84579:85724 m...James Cook
2008-04-031.19.1 Viewer merge: QAR_367, QAR-374, QAR-408, QAR-426Steven Bennetts
2008-04-01merge release@83343 skinning-1-merge@83714 -> releaseSteven Bennetts
2008-03-19QAR-377 maintenance-6 merge:Brian McGroarty