summaryrefslogtreecommitdiff
path: root/indra/llinventory
AgeCommit message (Expand)Author
2013-03-22merge with viewer-releaseRichard Linden
2012-11-14SH-3406 WIP convert fast timers to lltrace systemRichard Linden
2012-09-21MAINT-1601 Land remains for sale after purchasing for group.Kelly Washington
2012-09-06Automated merge with http://bitbucket.org/lindenlab/viewer-developmentRichard Linden
2012-09-05Merge in latest viewer-developmentsimon@Simon-PC.lindenlab.com
2012-07-31merge up to latest viewer-developmentOz Linden
2012-08-01Merge back viewer-lion, which has viewer-development and down-stream fixessimon@Simon-PC.lindenlab.com
2012-07-20MAINT-570 Remove unused memory tracking system LLMemTypeDave Parks
2012-06-18merge changes for storm-1843Oz Linden
2012-06-11storm-1843: remove unused ParcelMediaURLFilter codeKadah_Coba
2012-05-01merge changes for storm-1839Oz Linden
2012-04-06STORM-1839 Banlines need to be extended from 768 meters to 5000 meters now th...Jonathan Yap
2012-02-01converted a bunch of narrowing implicit conversions to explicitRichard Linden
2011-11-11EXP-1563 FIXED Negative upload cost displayed on the "Save to My Inventory" b...Vadim ProductEngine
2011-10-05merge with viewer-developmentRichard Nelson
2011-10-03EXP-1286 : First pass at Drag and Drop of tools. Not functional. Most hooks i...Merov Linden
2011-08-19mergeBrad Payne (Vir Linden)
2011-08-18mergeBrad Payne (Vir Linden)
2011-08-17convert tabs to spaces where they are forbiddenOz Linden
2011-08-10added fast timers to profile inventory LLSD deserializationRichard Nelson
2011-08-02Sh-2129 Viewer caps implementation for resource cost selected. Also cleanup o...prep linden
2011-07-01ER-1016 - "Remove ability for anyone to edit terrain" and ER-910 "Parcelsimon@lindenlab.com
2011-06-20ER-944: Add feature to control user sounds on a parcel. Added new checkboxessimon@lindenlab.com
2011-06-09ER-910: Parcel Privacy. Rename things in code to reflect feature name change...Dave SIMmONs
2011-06-08Merge latest from lindenlab/viewer-development/Dave SIMmONs
2011-05-24Merge latest from lindenlab/viewer-developmentDave SIMmONs
2011-05-24ER-914: Disable Parcel Privacy UI in viewer if on older simDave SIMmONs
2011-05-20SH-1252 and SH-1253 WIP.prep linden
2011-05-13ER-898: Modify llGetParcelDetails() on viewer to support parcel privacy. Rev...Dave SIMmONs
2011-05-02ER-858: Add viewer checkbox to toggle parcel privacy settings. Reviewed by K...Dave SIMmONs
2011-03-07STORM-1037 : pull into viewer-developmentMerov Linden
2011-03-09Automated merge up from viewer-development into mesh-developmentLoren Shih
2011-03-03storm-1037: remove the "hide url" checkboxes in parcel managementOz Linden
2011-02-07STORM-969 / ER-493 - Viewer side of the work to add 'Rentals' as a land type ...Kent Quirk
2010-12-21Automated merge up from viewer-developmentLoren Shih
2010-12-14VWR-24263: Crash fix for notecards with negative text lengthKadah_Coba
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 /Users/Aimee/Documents/Work/Li...Aimee Linden
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