summaryrefslogtreecommitdiff
path: root/indra/newview/llselectmgr.h
AgeCommit message (Expand)Author
2010-02-05merge from viewer2 trunk.Tofu Linden
2010-02-04EXT-3144 EXT-4226: Re-employ tentative state for individual items in media se...Rick Pasetto
2009-12-22Added prim cost equivalency to UI for importer and tools floater.Dave Parks
2009-12-18Merge with viewer-2-0Dave Parks
2009-12-16For EXT-3114: [BSI] Can't right click > edit a no-mod attachmentBrad Payne (Vir Linden)
2009-12-07Merge of viewer 2 changesPalmer
2009-11-30Linker optimization - use "extern template" for commonly regenerated templatesJames Cook
2009-11-29Revert extern template link optimization until I can build/test on PCJames Cook
2009-11-28Use extern template for common singletons to reduce code bloat/link time.James Cook
2009-11-11Merged in viewer 2 changes, adjusted xui problems, added mesh folder type and...Palmer
2009-11-02EXT-1744 1-click Sit object not spawning an object inspectorLeyla Farazha
2009-11-02Sync up with render-pipeline-7 ignore-dead-branchDavid Parks
2009-10-16svn merge -r134817:136516 svn+ssh://svn.lindenlab.com/svn/linden/branches/ava...Loren Shih
2009-10-07DEV-40215, DEV-40829,DEV-40374 ,DEV-40197, DEV-40749, DEV-3877 -- reviewed by...Jiao Li
2009-10-06EXT-1144 Unable to pay objects. LLFloaterPay was not taking object selection...James Cook
2009-10-03Merge inspectors UI project, gooey-4, into viewer-2 trunk. Added new tooltip...James Cook
2009-10-01svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/me...Monroe Williams
2009-09-09merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/g...Richard Nelson
2009-08-27svn merge -r 129841:129910 svn+ssh://svn.lindenlab.com/svn/linden/branches/mo...Monroe Williams
2009-07-10merge QAR-1579: texture-cleanup-1.Xiaohong Bao
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-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-06-26QAR-628 merge string-cleanup-5 -r 90476:90508 -> releaseSteven Bennetts
2008-05-19EFFECTIVE MERGES:Don Kjer
2008-05-07Back out QAR-520 maintenance-7 merge -- svn merge -r 86947:86946 svn+ssh://sv...Brian McGroarty
2008-05-07QAR-520 maintenance-7 merge -- svn merge -r 84923:86093 svn+ssh://svn.lindenl...Brian McGroarty
2008-04-04QAR-427Steven Bennetts
2008-04-01merge release@83343 skinning-1-merge@83714 -> releaseSteven Bennetts
2008-03-25merge release@82858 maint-render-2-merge@83010 -> releaseSteven Bennetts
2008-02-27Merge of windlight into release (QAR-286). This includes all changes inBrad Kittenbrink
2008-02-19merge svn+ssh://svn.lindenlab.com/svn/linden/qa/combo-merge-ui-2008-02-13 -r ...Steven Bennetts
2007-11-01svn merge -r 71509:72877 svn+ssh://svn.lindenlab.com/svn/linden/branches/Bran...Josh Bell
2007-10-11EFFECTIVE MERGE: svn merge -r 69928:70806 svn+ssh://svn/svn/linden/branches/m...Don Kjer
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-30Merge sl-search-opt-in back into the release branchSam Kolb
2007-07-18svn merge -r64837:65485 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint...Bryan O'Sullivan
2007-07-11svn merge --ignore-ancestry svn+ssh://svn/svn/linden/release@65088 svn+ssh://...Tess Chu
2007-06-21merge -r62831:64079 branches/maintenance to releaseKelly Washington
2007-06-04svn merge -r 62602:62831 svn+ssh://svn.lindenlab.com/svn/linden/branches/main...Josh Bell
2007-05-02svn merge -r 60342:61148 svn+ssh://svn/svn/linden/branches/maintenance into r...Don Kjer
2007-03-09merge -r 58986:59028 maintenanceSteven Bennetts
2007-03-02merge release@58699 beta-1-14-0@58707 -> releaseSteven Bennetts
2007-02-17merge -r 56779:58057 /branches/selection_managementRichard Nelson
2007-01-17merge release@56803 release-candidate@56833Steven Bennetts
2007-01-03corrected, removed, and updated comments throughout the code to be more usefu...Aaron Brashears
2007-01-02Print done when done.James Cook