summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorybridge.cpp
AgeCommit message (Expand)Author
2009-10-23mergeSteve Bennetts
2009-10-23mergeSteve Bennetts
2009-10-23For EXT-1863 : "Wear" and "Take Off" for items should be properly greyed out ...Loren Shih
2009-10-23svn merge -r137024:137071 svn+ssh://svn.lindenlab.com/svn/linden/branches/ava...Loren Shih
2009-10-23EXT-1698 I18N: the string (worn) or (worn on left hand) wont honor its trans...angela
2009-10-21svn merge -r136533:136919 svn+ssh://svn.lindenlab.com/svn/linden/branches/ava...Loren Shih
2009-10-21Merging revisions 2112-2128 of https://svn.aws.productengine.com/secondlife/p...Steven Bennetts
2009-10-21Merging revisions 2094-2099 of https://svn.aws.productengine.com/secondlife/p...Steven Bennetts
2009-10-19Merging revisions 2046-2068 of https://svn.aws.productengine.com/secondlife/p...Steven Bennetts
2009-10-16svn merge -r134817:136516 svn+ssh://svn.lindenlab.com/svn/linden/branches/ava...Loren Shih
2009-10-16Merge of latest avatar pipeline working branch into viewer2.0 branch.Eric Tulla
2009-10-14Merge a big bunch of fixes from maint-viewer. Hooray.Adam Moss
2009-10-12Merging avatar-pipeline/currently-worn-folder-10 down to viewer-2.Bradley Payne
2009-10-10EXT-1400 New 'name popup' lets you do things (IM, TP etc) to your own avatarLeyla Farazha
2009-09-29merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@...Steven Bennetts
2009-09-24Merging down avatar-pipeline/currently-worn-folder-8. Includes fixes for EXT...Bradley Payne
2009-09-10For DEV-34223: Avatar Pipeline Project - M6 (Current Outfit Folder, Appearanc...Bradley Payne
2009-09-07merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@...Steven Bennetts
2009-08-28svn merge -r 1490-1500 https://svn.aws.productengine.com/secondlife/pe/stable-2Steven Bennetts
2009-08-24merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3Richard Nelson
2009-08-18For DEV-34223: Avatar Pipeline Project - M6 (Current Outfit Folder). Make su...Bradley Payne
2009-08-18svn merge -r130469:130817 svn+ssh://svn.lindenlab.com/svn/linden/branches/ava...Loren Shih
2009-08-13For DEV-37907 : Goto item should scroll inventory view to baseobjLoren Shih
2009-08-12svn merge -r129617:130277 svn+ssh://svn.lindenlab.com/svn/linden/branches/ava...Loren Shih
2009-08-12merge https://svn.aws.productengine.com/secondlife/export-from-ll@1277 https:...Steven Bennetts
2009-08-05EXT-316 Enable the Viewer to generate calling cards for any agentSteven Bennetts
2009-08-04svn merge -r 128442:129343 svn+ssh://svn.lindenlab.com/svn/linden/branches/sk...Richard Nelson
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-21merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0/...Steven Bennetts
2009-07-14QAR-1602 Checkpoint for Avatar Pipeline Multiple textures branchNeal Orman
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-24merge -r125267:125272 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-...Loren Shih
2009-06-21merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3Steven Bennetts
2009-06-04Merge of QAR-1383 event-system-7 into trunk.Brad Kittenbrink
2009-05-22svn merge -r121194:121210Adam Moss
2009-04-16svn merge -r117314:117337Adam Moss
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-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-04Merging from server/server-1.25 back to trunk.Robert Knop
2008-06-27QAR-669 1.20 Viewer RC11Steven Bennetts
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-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-031.19.1 Viewer merge: QAR_367, QAR-374, QAR-408, QAR-426Steven Bennetts