summaryrefslogtreecommitdiff
path: root/indra/llui/llcombobox.cpp
AgeCommit message (Expand)Author
2009-07-27Merged skinning-17 into viewer-2 for bug fixes. Commented out new IM window ...James Cook
2009-07-10EXT-127: Tooltips don't disappear immediately after moving mouse out of objectRichard Nelson
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-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-03-13svn merge -r114093:114412 svn+ssh://svn.lindenlab.com/svn/linden/branches/fea...Christian Goetze
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-08-12QAR-767 Combined maint-render-7 and maint-viewer-9 mergeSteven 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-30svn merge -r 86190:86191 maint-ui-11-merge (EFFECTIVE MERGE: -r 84579:85724 m...James Cook
2008-04-17QAR-449 Viewer 1.20 RC 1Steven Bennetts
2008-04-17QAR-449 Viewer 1.20 RC 0Steven Bennetts
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-02-14svn merge -r 79730:79944 svn+ssh://svn.lindenlab.com/svn/linden/branches/parc...Josh Bell
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-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-06-21merge -r62831:64079 branches/maintenance to releaseKelly Washington
2007-05-02svn merge -r 60342:61148 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-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-03-02merge release@58699 beta-1-14-0@58707 -> releaseSteven Bennetts
2007-01-04svn merge svn+ssh://svn.lindenlab.com/svn/linden/release@56429 svn+ssh://svn....Josh Bell
2007-01-03corrected, removed, and updated comments throughout the code to be more usefu...Aaron Brashears
2007-01-02Print done when done.James Cook