summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterchat.cpp
AgeCommit message (Expand)Author
2010-02-25automated merge from trunkRoxie Linden
2010-02-25automated mergeRoxie Linden
2010-02-24Automated merge up from viewer 2.0 trunk.Roxie Linden
2010-01-20fixed EXT-4162 Remove "Show IMs in Nearby Chat"Igor Borovkov
2010-01-18work on EXT-4322 Remove the Communicate floaterYchebotarev ProductEngine
2010-01-13fixed EXT-4073 [BSI] Shouting is malformed in plain chat modeIgor Borovkov
2010-01-06work on EXT-3842 People / Recent shows residents who have not spoken or sent IMYuri Chebotarev
2009-12-09Fixed buildPaul Guslisty
2009-12-09Fixed low bug EXT - 2688 (Viewer crashes if exit from disconnected viewer wit...Paul Guslisty
2009-11-23convert signals to allocate on demand in order to speed up widget constructionrichard
2009-11-18Changes to IM Logging, includes preference changesSteve Bennetts
2009-10-29Implemented major task EXT-1487 (Reimplement chat history persistence using L...Sergey Borushevsky
2009-10-24EXT-1305 Hook up Script Error preferences -- reviewed by jamesangela
2009-10-03Merge inspectors UI project, gooey-4, into viewer-2 trunk. Added new tooltip...James Cook
2009-09-30DEV-35039 Viewer 2.0 Help System - Viewer DevelopmentAdam Moss
2009-09-07merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@...Steven Bennetts
2009-08-27svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/mo...Monroe Williams
2009-08-24merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3Richard Nelson
2009-08-10Small change to disable echoing chat and IM to the "console" (2d text overlay...Steven Bennetts
2009-08-04svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/sk...Richard Nelson
2009-07-27Merge xui-army-8 to pick up 2+ weeks of art, colors, and dialog layout changes.James Cook
2009-07-21merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0/...Steven Bennetts
2009-07-09DEV-34822 - merge 1.23Roxanne Skelly
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 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3Steven Bennetts
2009-05-22svn merge -r121194:121210Adam 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
2008-12-15svn merge -r105329:105903 svn+ssh://svn/svn/linden/branches/featurettes/featu...Melinda Green
2008-08-13QAR-782 Merge featurettes batch #2Steven 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-06-02svn merge -r88066:88786 svn+ssh://svn.lindenlab.com/svn/linden/branches/cmake...Bryan O'Sullivan
2008-04-30svn merge -r 86190:86191 maint-ui-11-merge (EFFECTIVE MERGE: -r 84579:85724 m...James Cook
2008-04-28merge release-QAR-499 Viewer 1.20 RC 2 (additional changes)Steven Bennetts
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-11-21svn merge -r 73148:74186 svn+ssh://svn.lindenlab.com/svn/linden/branches/Bran...Josh Bell
2007-10-17QAR-25 svn merge -r71797:71803 svn+ssh://svn/svn/linden/branches/logitech_lcd_4Christian Goetze
2007-10-04Result of svn merge -r71162:71205 svn+ssh://svn/svn/linden/branches/new-licen...Aaron Brashears
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-29revert: svn merge -r 64506:64505 svn+ssh://svn/svn/linden/release back into r...Don Kjer
2007-06-29Changes to make Logitech code more LL Code Standards compliant, plus remove a...Jake Simpson
2007-06-21merge -r62831:64079 branches/maintenance to releaseKelly Washington
2007-05-08Removing Logitech LCD code: svn merge -r 60616:60615 svn+ssh://svn/svn/linden...Don Kjer