summaryrefslogtreecommitdiff
path: root/indra/newview/lltooldraganddrop.cpp
AgeCommit message (Expand)Author
2010-03-20mergeDave Parks
2010-03-18Related to EXT-5909 (Accepted/declined inventory offer shouldn't spawn chiclet).Andrew Dyukov
2010-03-12Fixed reopened normal sub-task EXT-5950 (Do not spawn IM chiclet for "drop on...Andrew Dyukov
2010-01-28Merge from viewer2 trunk.Tofu Linden
2010-01-27CID-197Tofu Linden
2010-01-20Merge from viewer2. Minor conflict resolved.Tofu Linden
2010-01-14EXT-3795 First run messages still display (click & drag on map, Build tools ...angela
2010-01-13drag-and-drop mesh asset onto in-world objectKarl Stiefvater (qarl)
2009-12-14Merging in latest viewer 2Palmer Truelson
2009-12-07Fixing merge borkasaurs.Palmer
2009-12-07Merge of viewer 2 changesPalmer
2009-12-08Fixed major bug EXT-3191 (Crash after dragging inventory item to avatar or IM...Mike Antipov
2009-12-01Fix Linux/Mac builds due to LLToolDragAndDrop member function pointersJames Cook
2009-12-01automated merge for viewer-2.0 -> avp.Loren Shih
2009-12-01EXT-2964 : Can drag-and-drop a folder with links onto an objectLoren Shih
2009-11-30INFRASTRUCTURE: LLToolDragAndDrop cleanupLoren Shih
2009-11-25Created lightweight LLNotificationsUtil::add(), switched most alerts to use itJames Cook
2009-11-24Removed llnotifications.h from all headers by adding llnotificationsptr.hJames Cook
2009-11-17Automated merge with ssh://palmer@hg.lindenlab.com/viewer/viewer-2-0Palmer
2009-11-12LLAppearanceManager cleanup - turning into proper singletonBrad Payne (Vir Linden)
2009-11-11Merged in viewer 2 changes, adjusted xui problems, added mesh folder type and...Palmer
2009-11-04Redo Bao's broken mergeBryan O'Sullivan
2009-11-02Sync up with render-pipeline-7 ignore-dead-branchDavid Parks
2009-10-23svn merge -r137024:137071 svn+ssh://svn.lindenlab.com/svn/linden/branches/ava...Loren Shih
2009-10-03Merge inspectors UI project, gooey-4, into viewer-2 trunk. Added new tooltip...James Cook
2009-09-29merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@...Steven Bennetts
2009-09-10For DEV-34223: Avatar Pipeline Project - M6 (Current Outfit Folder, Appearanc...Bradley Payne
2009-09-09merge -r132032-132812 svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/g...Richard Nelson
2009-08-28svn merge -r 1490-1500 https://svn.aws.productengine.com/secondlife/pe/stable-2Steven Bennetts
2009-08-26svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-...Steven Bennetts
2009-08-04svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/sk...Richard Nelson
2009-07-30merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0/...Steven Bennetts
2009-07-24svn merge -r 127369:127511 svn+ssh://svn.lindenlab.com/svn/linden/branches/av...Loren Shih
2009-07-23svn merge -r 127683:128178 svn+ssh://svn.lindenlab.com/svn/linden/branches/av...Loren Shih
2009-07-10merge QAR-1579: texture-cleanup-1.Xiaohong Bao
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-13svn merge -r114093:114412 svn+ssh://svn.lindenlab.com/svn/linden/branches/fea...Christian Goetze
2009-03-05Merging in Avatar Pipeline work for Viewer 1.23 (QAR-1272).Eric Tulla
2009-01-17svn merge -r108142:108148 svn+ssh://svn.lindenlab.com/svn/linden/qa/maint-ser...Andrew Meadows
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-02QAR-1040 maint-viewer-11 + OpenAL combo mergemeAdam Moss
2008-08-12QAR-767 Combined maint-render-7 and maint-viewer-9 mergeSteven Bennetts
2008-07-23svn merge -r92720:92721 svn+ssh://svn.lindenlab.com/svn/linden/branches/uv-pi...Karl Steifvater
2008-07-22svn merge -r92710:92709 svn+ssh://svn.lindenlab.com/svn/linden/release --> re...Josh Bell
2008-07-22merge uv-picking branch.Karl Steifvater
2008-06-26QAR-628 merge string-cleanup-5 -r 90476:90508 -> releaseSteven 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