summaryrefslogtreecommitdiff
path: root/indra/newview/llstylemap.cpp
AgeCommit message (Expand)Author
2010-02-26automated mergeRoxie Linden
2010-02-10fixed for plain text chat history EXT-5279 Resident Names should Appear in Se...Igor Borovkov
2009-10-03Merge inspectors UI project, gooey-4, into viewer-2 trunk. Added new tooltip...James Cook
2009-08-24merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3Richard Nelson
2009-07-09DEV-34822 - merge 1.23Roxanne Skelly
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-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-09-29QAR-872 Viewer 1.21 RC 3Steven Bennetts
2008-08-13QAR-782 Merge featurettes batch #2Steven 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-04-30svn merge -r 86190:86191 maint-ui-11-merge (EFFECTIVE MERGE: -r 84579:85724 m...James Cook