summaryrefslogtreecommitdiff
path: root/indra/llui/llscrolllistctrl.h
AgeCommit message (Expand)Author
2010-03-03fix for normal EXT-1391 Group Info: Avatar name should end with ellipsis if i...Ychebotarev ProductEngine
2010-02-24PE merge. Conflict resolved.Tofu Linden
2010-02-23cleanup and fix buildYchebotarev ProductEngine
2010-02-23fix for normal EXT-5598 Group member status list is sorted by name instead of...Ychebotarev ProductEngine
2010-02-23gah, more dos line-endings in PE diffs.Tofu Linden
2010-01-26Fixed critical bug EXT-4663 ([BSI] Inviting Residents to groups produces erro...Vadim Savchuk
2010-01-20Update for low bug EXT-4371 - Text from search history drop-down list merge w...Dmitry Zaporozhan
2009-10-03Merge inspectors UI project, gooey-4, into viewer-2 trunk. Added new tooltip...James Cook
2009-09-29merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@...Steven Bennetts
2009-09-09merge -r 1586-1593 https://svn.aws.productengine.com/secondlife/pe/stable-2 -...Steven Bennetts
2009-09-09merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/g...Richard Nelson
2009-09-07merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@...Steven Bennetts
2009-09-04Merging the SLURLs Everywhere branch (viewer-2.0.0-slurls-3) intoMartin Reddy
2009-08-24merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3Richard Nelson
2009-08-04svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/sk...Richard Nelson
2009-07-27Merged skinning-17 into viewer-2 for bug fixes. Commented out new IM window ...James Cook
2009-07-10merge QAR-1579: texture-cleanup-1.Xiaohong Bao
2009-07-07Merge skinning-14 to viewer-2, including refactoring many floaters to registe...James Cook
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-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-05-19EFFECTIVE MERGES:Don Kjer
2008-05-07Back out QAR-520 maintenance-7 merge -- svn merge -r 86947:86946 svn+ssh://sv...Brian McGroarty
2008-05-07QAR-520 maintenance-7 merge -- svn merge -r 84923:86093 svn+ssh://svn.lindenl...Brian McGroarty
2008-04-01merge release@83343 skinning-1-merge@83714 -> releaseSteven Bennetts
2008-02-19merge -r 78989:80279 Branch_1-19-0-Viewer-> releaseSteven Bennetts
2008-02-19merge svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r ...Steven Bennetts
2008-01-17QAR-211: Logical merge of:Josh Bell
2007-12-19svn merge -r 75354:76103 svn+ssh://svn.lindenlab.com/svn/linden/branches/voic...Jon Wolk
2007-11-09EFFECTIVE MERGE: svn merge -r 70833:71458 svn+ssh://svn/svn/linden/branches/m...Don Kjer
2007-10-10svn merge -r71238:71367 svn+ssh://svn/svn/linden/branches/maint-ui-qa3Christian Goetze
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-08-02Merge down from Branch_1-18-1:Monroe Williams
2007-07-02svn merge -r 64079:64548 svn+ssh://svn/svn/linden/branches/maintenance into r...Don Kjer
2007-06-21merge -r62831:64079 branches/maintenance to releaseKelly Washington
2007-06-13result of merge manually performed through diff and patch. svn diff svn+ssh:/...Aaron Brashears
2007-05-01svn merge -r 59163:61099 svn+ssh://svn/svn/linden/branches/release-candidate ...Don Kjer
2007-04-05svn merge -r 59234:60086 svn+ssh://svn/svn/linden/branches/live_lsl_help2 -> ...Richard Nelson
2007-03-31svn merge -r 59364:59813 svn+ssh://svn.lindenlab.com/svn/linden/branches/main...Josh Bell
2007-02-20svn merge -r 57620:58007 svn+ssh://svn.lindenlab.com/svn/linden/branches/main...Josh Bell
2007-02-05merge -r 57111:57464 maintenance.Steven Bennetts
2007-01-17merge release@56803 release-candidate@56833Steven Bennetts
2007-01-02Print done when done.James Cook