summaryrefslogtreecommitdiff
path: root/indra/newview/llimpanel.h
AgeCommit message (Expand)Author
2009-09-09merge merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewe...Steven Bennetts
2009-08-19EXT-592 IM chat is not updated for the first text message. PE added LLIMFloa...James Cook
2009-08-18merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@...Steven Bennetts
2009-08-18EXT-495 IM windows don't autoscroll. Added track_bottom param to floater_im_...James Cook
2009-08-13merge -r 130196-130356 skinning-20 -> viewer-2.0.0-3Steven Bennetts
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-07Merge skinning-14 to viewer-2, including refactoring many floaters to registe...James Cook
2009-06-21merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3Steven Bennetts
2009-03-19svn merge -r 114639:114640 svn+ssh://svn.lindenlab.com/svn/linden/branches/qa...Monroe Williams
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-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-01merge release@83343 skinning-1-merge@83714 -> releaseSteven Bennetts
2008-03-04svn merge -r 81304:81392 svn+ssh://svn.lindenlab.com/svn/linden/branches/main...Josh Bell
2008-02-19merge svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r ...Steven Bennetts
2007-12-19svn merge -r 75354:76103 svn+ssh://svn.lindenlab.com/svn/linden/branches/voic...Jon Wolk
2007-10-22svn merge -r 71902:71933 svn+ssh://svn.lindenlab.com/svn/linden/branches/expi...Jon Wolk
2007-10-04Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-licen...Aaron Brashears
2007-09-17svn merge -r 68785:68784 svn+ssh://svn.lindenlab.com/svn/linden/branches/main...Josh Bell
2007-09-14EFFECTIVE MERGE: svn merge -r 68118:68999 svn+ssh://svn/svn/linden/branches/m...Don Kjer
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-07-02svn merge -r 64079:64548 svn+ssh://svn/svn/linden/branches/maintenance into r...Don Kjer
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-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-01-02Print done when done.James Cook