summaryrefslogtreecommitdiff
path: root/indra/llui/llfloater.cpp
AgeCommit message (Expand)Author
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-14Merge skinning-15 to viewer-2. Fixes include:James Cook
2009-07-10EXT-70 Camera and Movement controls don't save their positionsSteven Bennetts
2009-07-09EXT-126 - Grayed empty field appears after minimize the 'Search Second Life' dlgRichard 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-04-16svn merge -r117314:117337Adam Moss
2009-03-13svn merge -r114093:114412 svn+ssh://svn.lindenlab.com/svn/linden/branches/fea...Christian Goetze
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-11-07QAR-992 Merging revisions 101012-101170,101686-101687 of svn+ssh://svn.linden...Mark Palange
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-07-18merge support-featurettes-snapshot-merge-2 for QAR-754, includes:James Cook
2008-06-26QAR-628 merge string-cleanup-5 -r 90476:90508 -> releaseSteven Bennetts
2008-05-14Result of svn merge -r 87455:87538 $SVN/branches/tulla/vc3-merge .Eric Tulla
2008-05-06merge release-QAR-511 Viewer 1.20 RC 5Steven Bennetts
2008-04-28merge release-QAR-499 Viewer 1.20 RC 3Steven Bennetts
2008-04-17QAR-449 Viewer 1.20 RC 0Steven Bennetts
2008-04-04QAR-427Steven Bennetts
2008-04-031.19.1 Viewer merge: QAR_367, QAR-374, QAR-408, QAR-426Steven Bennetts
2008-04-03svn merge -r 83778:83944 maint-ui-10-mergeJames Cook
2008-04-01merge release@83343 skinning-1-merge@83714 -> releaseSteven Bennetts
2008-02-27Merge of windlight into release (QAR-286). This includes all changes inBrad Kittenbrink
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-01merge Branch_1-19-0-Viewer -r 78432:78989 -> releaseSteven Bennetts
2007-12-21svn merge -r74200:76302 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branc...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-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-18svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint...Bryan O'Sullivan
2007-06-13result of merge manually performed through diff and patch. svn diff svn+ssh:/...Aaron Brashears
2007-05-08svn merge -r 61343:61423 svn+ssh://svn/svn/linden/branches/maintenance into r...Don Kjer
2007-05-04svn merge -r 61148:61343 svn+ssh://svn/svn/linden/branches/maintenance into r...Don Kjer
2007-05-02svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into r...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-16merge -r 59028:59178 maintenance -> release.Steven Bennetts
2007-03-02merge -r 58503:58641 maintenance -> releaseSteven Bennetts
2007-02-20svn merge -r 57620:58007 svn+ssh://svn.lindenlab.com/svn/linden/branches/main...Josh Bell
2007-02-17merge -r 56779:58057 /branches/selection_managementRichard Nelson
2007-02-09Result of svn merge -r57350:57790 svn+ssh://svn/svn/linden/branches/os-patche...Aaron Brashears