summaryrefslogtreecommitdiff
path: root/indra/llinventory
AgeCommit message (Collapse)Author
2010-12-03Automated merge up from viewer-developmentLoren Shih
2010-11-25Forgot to give myself credit.Jonathan Yap
2010-11-25Fix link error: unsigned char const TASK_INVENTORY_ASSET_KEYJonathan Yap
2010-10-20Automated merge up from viewer-developmentLoren Shih
2010-10-13correct licenses (fix problem with license change merge)Oz Linden
2010-09-30Put some errant tests under if (LL_TESTS) conditional.Dave Parks
2010-09-27mergeDave Parks
2010-09-24Fix for bad zipping of meshes and add mesh icon back to repository.Dave Parks
2010-09-21Fix for build failures - disabling tcmalloc for nowBrad Payne (Vir Linden)
2010-09-03Post-convert merge by convert_monolith.py from ↵Aimee Linden
/Users/Aimee/Documents/Work/Linden-Lab/Development/viewer/convert/viewer-identity-evolution
2010-09-03Merge between james/viewer-identity-evolution and dessie/viewer-publicAimee Linden
2010-08-31mergeDave Parks
2010-08-30merging up from viewer-developmentAaron Terrell (Enus)
2010-08-25mergeDave Parks
2010-08-24standardizing test suite names as class name under testAaron Terrell (Enus)
2010-08-24Backed out changeset c3d41f18ce2bTofu Linden
back-out the back-out for this branch. yay.
2010-08-24Backed out changeset a62bf7c0af21Tofu Linden
Backing out this merge that I pushed (prematurely) to the wrong place.
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-21Merge with q/viewer-releaseLeyla Farazha
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 ↵Dave Parks
merge fixes.
2010-06-08EXT-6934 FIXED method LLInventoryObject::rename does not change Name, if ↵Vladimir Pchelko
string is empty after correction. Problem description: LLInventoryObject::rename corrects incoming string and remove odd spaces, for example converts string " " to empty string "", as the result empty string can be set as InventoryObject name. Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/505/ --HG-- branch : product-engine
2010-06-07Merge with render-pipelineDave Parks
2010-05-13merge pull from dessie/viewer-public, picking up SLE codeJames Cook
2010-05-11merge from dessie/viewer-public right before SLE code landedJames Cook
2010-05-11EXT-7305 : FIXED : Changed LLWearableDictionary to LLWearableTypeLoren Shih
Refactored LLWearableDictionary to look more like LLAssetType/LLFolderType/etc. in terms of code design. This required a lot of superficial changes across many files. Overall functionality has not changed.
2010-04-28merge from viewer-trunkTofu Linden
2010-04-27DEV-49349 : AIS hides broken inventory links after a relogLoren Shih
inventory_and_asset_types_match is always true for links (i.e. links should not have to be a certain inventory type).
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
Superficial header file cleanup. Change made to simulator files as well.
2010-04-05EXT-6703 : LLInventory.h cleanup and create new LLInventoryDefinesLoren Shih
Superficial header file cleanup. Change made to simulator files as well.
2010-04-05EXT-6703 : LLInventory.h cleanup and create new LLInventoryDefinesLoren Shih
Took out enums and flags from LLInventory into LLInventoryDefines Did a bunch of header file reformatting for LLInventory.h Change made to simulator files as well.
2010-04-02EXT-6689 : INFRASTRUCTURE : LLInventoryBridge code cleanupLoren Shih
Moved a bunch of local llinventorybridge functions into .cpp. Did a bunch of superficial cleanup of llinventorybridge and related files.
2010-03-30HUGE merge from viewer-trunk. Many conflicts resolved.Tofu Linden
2010-03-29EXT-5940 : Typedef all vector<LLUUID>'sLoren Shih
Superficial cleanup to change all typedef std::vector<LLUUID> to use a common typedef uuid_vec_t instead.
2010-03-29EXT-3075 : Remove swear words from comments across viewerLoren Shih
This bugs me in a minor way. Did a search-and-cleanup on various swear words.
2010-03-08Merge with viewer 2 beta 4James Cook
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
If you're reading this message, this was reviewed by Soft, Nyx or Aura. :)
2010-02-16DEV-46234 Group Invite contains SLID with Resident, andJames Cook
DEV-46231 Pay resident notification contains SLID with Resident last name, and DEV-46232 Payment confirmation of buy and sell parcel of land contains SLID with Resident in both notifications Clean up server-side name strings with regex matching. Reviewed with Simon.
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-28 23:03:25 +0000