summaryrefslogtreecommitdiff
path: root/indra/llinventory
AgeCommit message (Expand)Author
2010-08-31mergeDave Parks
2010-08-25mergeDave Parks
2010-08-24Backed out changeset c3d41f18ce2bTofu Linden
2010-08-24Backed out changeset a62bf7c0af21Tofu Linden
2010-08-24merge heads. whew.Tofu Linden
2010-08-18VWR-20768 (SNOW-507) FIXED Missing LL_TEST conditions in cmake filesAimee Linden
2010-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
2010-07-19Bury the dead code day: Cleanup redundant XUI filesAimee Linden
2010-07-19Bury the dead code day: Cleanup redundant XUI filesAimee Linden
2010-07-13Fix for mesh upload, consolidate generating bad indices, and normal generation.Dave Parks
2010-06-14mergeDave Parks
2010-06-14Builds with LLConvexDecompInter as a static lib.Dave Parks
2010-06-14mergeDave Parks
2010-06-13mergeTofu Linden
2010-06-11Merged from viewer-releaseDessie Linden
2010-06-10Add "LL_MESH_ENABLED" preprocessor flag for toggling mesh code. Couple of me...Dave Parks
2010-06-08EXT-6934 FIXED method LLInventoryObject::rename does not change Name, if stri...Vladimir Pchelko
2010-06-07Merge with render-pipelineDave Parks
2010-05-11EXT-7305 : FIXED : Changed LLWearableDictionary to LLWearableTypeLoren Shih
2010-04-28merge from viewer-trunkTofu Linden
2010-04-27DEV-49349 : AIS hides broken inventory links after a relogLoren Shih
2010-04-06YET another hairy merge from viewer-trunk. Conflicts resolved... so far.Tofu Linden
2010-04-06another hairy merge from viewer-trunk :(Tofu Linden
2010-04-05EXT-6703 : LLInventory.h cleanup and create new LLInventoryDefinesLoren Shih
2010-04-05EXT-6703 : LLInventory.h cleanup and create new LLInventoryDefinesLoren Shih
2010-04-05EXT-6703 : LLInventory.h cleanup and create new LLInventoryDefinesLoren Shih
2010-04-02EXT-6689 : INFRASTRUCTURE : LLInventoryBridge code cleanupLoren Shih
2010-03-30HUGE merge from viewer-trunk. Many conflicts resolved.Tofu Linden
2010-03-29EXT-5940 : Typedef all vector<LLUUID>'sLoren Shih
2010-03-29EXT-3075 : Remove swear words from comments across viewerLoren Shih
2010-03-01Merge with viewer-2-0Dave Parks
2010-02-26EXT-5820 I can copy asset UUID from non-FULLPERM assets turning on admin mode.Tofu Linden
2010-01-29merge from viewer2.Tofu Linden
2010-01-29CID-332Tofu Linden
2009-11-25Merge of viewer 2Palmer Truelson
2009-11-17Automated merge with ssh://palmer@hg.lindenlab.com/viewer/viewer-2-0Palmer
2009-11-16Header file cleanup.Loren Shih
2009-11-13EXT-2482 : Newly created folders have wrong default typeLoren Shih
2009-11-12Fixes for mesh inventory type correctness.Palmer
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-02Merge of viewer-2-0 changesPalmer
2009-11-02Sync up with render-pipeline-7 ignore-dead-branchDavid Parks
2009-10-19mergeSteve Bennetts
2009-10-16merge from latest svn/viewer-2-0 to hg/viewer-2-0Mark Palange (Mani)
2009-10-16DEV-41404 convert monolithic tut llinventoryparcel test to llinventory integr...Adam Moss
2009-10-14Merge a big bunch of fixes from maint-viewer. Hooray.Adam Moss
2009-10-12DEV-41176 convert legacy inventory.cpp tut test into an llinventory integrati...Adam Moss
2009-09-18Merged latest viewer/viewer-20 into login-api.brad kittenbrink
2009-09-08Merge from trunkBryan O'Sullivan