summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorymodel.cpp
AgeCommit message (Expand)Author
2009-11-12Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Brad Payne (Vir Linden)
2009-11-11Took out unnecessary llinfos msg from LLInventoryModel.Loren Shih
2009-11-11Link spam reduction - consolidating inventory cache loading messages.Brad Payne (Vir Linden)
2009-11-11mergeLoren Shih
2009-11-11adding warning msg when fetching for folders with NULL uuidangela
2009-11-10EXT-2349 : Diagnose warning spam: [X] is in model and in view, but STRUCTURE ...Loren Shih
2009-11-10Automated merge with ssh://angela@hg.lindenlab.com/viewer/viewer-2-0/angela
2009-11-09mergeBrad Payne (Vir Linden)
2009-11-09For EXT-2325: Should purge inventory cache moving from 1.23 to 2.0.Brad Payne (Vir Linden)
2009-11-09For EXT-2335 Diagnose warning spam: "LLInventoryPanel::buildNewViews called w...Loren Shih
2009-11-09escape from infinitive loop of fetching inventory folder with NULL uuidangela
2009-11-04Redo Bao's broken mergeBryan O'Sullivan
2009-11-02EXT-1866 : Inventory Side PanelLoren Shih
2009-10-27Fix for gInventory cleanup on shutdown, includes making LLNavigationBar a LLS...Steve Bennetts
2009-10-26Fixed a crash on exit in gInventory destructor.Steve Bennetts
2009-10-23mergeSteve Bennetts
2009-10-23svn merge -r137024:137071 svn+ssh://svn.lindenlab.com/svn/linden/branches/ava...Loren Shih
2009-09-30QAR-1619: merge up to 2009-09-26 viewer/viewer-20Nat Goodspeed
2009-09-24Merging down avatar-pipeline/currently-worn-folder-8. Includes fixes for EXT...Bradley Payne
2009-09-18Merged latest viewer/viewer-20 into login-api.brad kittenbrink
2009-09-10For DEV-34223: Avatar Pipeline Project - M6 (Current Outfit Folder, Appearanc...Bradley Payne
2009-09-02merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@...Steven Bennetts
2009-08-27Merged latest login-api with latest viewer-2.0.0-3 up through plugin-api-05 m...brad kittenbrink
2009-08-18svn merge -r130469:130817 svn+ssh://svn.lindenlab.com/svn/linden/branches/ava...Loren Shih
2009-08-13For DEV-37955 : Broken links possible if linked item is cached but baseobj no...Loren Shih
2009-08-13Merged latest viewer-2.0.0-3 change up through svn r130333 into login-api.brad kittenbrink
2009-08-12svn merge -r129617:130277 svn+ssh://svn.lindenlab.com/svn/linden/branches/ava...Loren Shih
2009-08-05EXT-316 Enable the Viewer to generate calling cards for any agentSteven Bennetts
2009-07-30Merged in viewer-2.0.0-3 changes up through r129050. Boost got clobbered so ...brad kittenbrink
2009-07-23svn merge -r 127683:128178 svn+ssh://svn.lindenlab.com/svn/linden/branches/av...Loren Shih
2009-07-07Merge skinning-14 to viewer-2, including refactoring many floaters to registe...James Cook
2009-06-29Merge with viewer-2.0.0-3Bryan O'Sullivan
2009-06-24merge -r125267:125272 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-...Loren Shih
2009-06-23A few more merge error fixes.Mark Palange (Mani)
2009-06-23Incomplete attempt to clean up Mercurial branch buildNat Goodspeed
2009-06-21merge -r 122421-124917 viewer-2.0.0-2 -> viewer-2.0.0-3Steven Bennetts
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-23QAR-1142 merging 1.22 RC0-RC4 changes.Mark Palange
2008-09-16QAR-751 : Merge Agent Inventory Services - Fetch Inventory and Fetch Inventor...Kartic Krishnamurthy
2008-09-12QAR-855 Viewer 1.21 RC 2Steven Bennetts
2008-09-05svn merge -r95288:95907 svn+ssh://svn.lindenlab.com/svn/linden/qa/maint-serve...Andrew Meadows
2008-08-12QAR-767 Combined maint-render-7 and maint-viewer-9 mergeSteven Bennetts
2008-07-22QAR-758 1.20 Viewer RC 12, 13, 14, 15 -> ReleaseSteven Bennetts
2008-06-26QAR-628 merge string-cleanup-5 -r 90476:90508 -> releaseSteven Bennetts
2008-05-08QAR-570 maint-render-4 mergeSteven Bennetts
2008-04-031.19.1 Viewer merge: QAR_367, QAR-374, QAR-408, QAR-426Steven Bennetts
2008-04-01merge release@83343 skinning-1-merge@83714 -> releaseSteven Bennetts
2008-02-28svn merge -r 80357:80990 svn+ssh://svn.lindenlab.com/svn/linden/branches/Bran...Josh Bell
2007-12-19svn merge -r 75354:76103 svn+ssh://svn.lindenlab.com/svn/linden/branches/voic...Jon Wolk