summaryrefslogtreecommitdiff
path: root/indra/llinventory
AgeCommit message (Expand)Author
2013-03-22merge with viewer-releaseRichard Linden
2013-03-11llinventory merge fixesprep
2013-03-11mergeprep
2013-03-11mergeprep
2013-03-11Viewer-chui mergeprep
2013-01-30Pull merge from lindenlab/viewer-developementMerov Linden
2013-01-24merging in viewer-beta.Nyx Linden
2013-01-15SH-3339 WIP, SH-3645 WIP - added getActualDescription to obviate an obnoxious...Brad Payne (Vir Linden)
2012-11-14SH-3406 WIP convert fast timers to lltrace systemRichard Linden
2012-11-09Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.William Todd Stinson
2012-10-11Updating linux build to gcc4.6Don Kjer
2012-09-21MAINT-1601 Land remains for sale after purchasing for group.Kelly Washington
2012-09-20Partial rewrite of llifstream and llofstream (Windows implementation pending)...Don Kjer
2012-09-13Fleshed out target_link_libraries dependencies between libraries. Appearance...Don Kjer
2012-09-08Removed most llappearance -> llui dependencies (LLTrans remains). Moved LLIn...Don Kjer
2012-09-06Automated merge with http://bitbucket.org/lindenlab/viewer-developmentRichard Linden
2012-09-05Merge in latest viewer-developmentsimon@Simon-PC.lindenlab.com
2012-08-02CHUI-228 FIX Inventory object creation date initialized with 0 to avoid some ...Seth ProductEngine
2012-07-31merge up to latest viewer-developmentOz Linden
2012-07-27Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.Todd Stinson
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-20CHUI-101 WIP Make LLFolderview general purposeRichard Linden
2012-06-18merge changes for storm-1843Oz Linden
2012-06-15Automated merge with ssh://hg.lindenlab.com/richard/viewer-chui-folderviewRichard Linden
2012-06-15CHUI-101 WIP Make LLFolderView general purposeRichard Linden
2012-06-11storm-1843: remove unused ParcelMediaURLFilter codeKadah_Coba
2012-06-08CHUI-120 WIP Added conversations participants drag and drop from avatar lists...Seth ProductEngine
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