summaryrefslogtreecommitdiff
path: root/indra/llinventory
AgeCommit message (Collapse)Author
2014-07-22Sync merge with lindenlab/viewer-releaseMerov Linden
2014-06-17Merge viewer-release and become version 3.7.9simon
2014-06-07MAINT-4001 : Make Received Items not movable (protected), consolidate ↵Merov Linden
Received Items folders which may have been moved
2014-05-30DD-92 : pull merge lindenlab/sunshine-external to get AISv3 workMerov Linden
2014-05-30Pull merge from lindenlab/viewer-releaseMerov Linden
2014-05-14v-r -> s-e merge WIPBrad Payne (Vir Linden)
2014-05-13sunshine-external merge WIPBrad Payne (Vir Linden)
2014-04-22MergeXiaohong Bao
2013-12-05mergeBrad Payne (Vir Linden)
2013-11-11Automated merge with http://bitbucket.org/lindenlab/viewer-releaseRichard Linden
2013-10-15renamed TimeBlock to BlockTimerStatHandleRichard Linden
2013-10-01changed over to manual naming of MemTrackable statsRichard Linden
changed claimMem and disclaimMem behavior to not pass through argument added more mem tracking stats to floater_stats
2013-09-05changed fast timer over to using macroRichard Linden
another attempt to move mem stat into base class
2013-09-03MAINT-3082 : Remove unused viewer LLParcel codesimon_linden
2013-08-15moved unit types out of LLUnits namespace, since they are prefixedRichard Linden
2013-08-14BUILDFIX: added header for numeric_limits support on gccRichard Linden
added convenience types for units F32Seconds, etc.
2013-08-12SH-4399 FIX: Interesting: Texture console MB Bound 0/384 and texture queue ↵Richard Linden
bounces once per second SH-4346 FIX: Interesting: some integer Statistics are displayed as floating point after crossing region boundary made llerrs/infos/etc properly variadic wrt tags LL_INFOS("A", "B", "C") works, for example fixed unit tests remove llsimplestat
2013-08-09second phase summer cleaningRichard Linden
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09Refactoring link creation calls in preparation for adding AIS v3 hook.Don Kjer
2013-08-07MAINT-2257 : Create ability to limit region/estate and parcel access bysimon
either Piof or Group membership (viewer changes). Using Mnikolenko's patch
2013-07-30Summer cleaning - removed a lot of llcommon dependencies to speed up build timesRichard Linden
consolidated most indra-specific constants in llcommon under indra_constants.h fixed issues with operations on mixed unit types (implicit and explicit) made LL_INFOS() style macros variadic in order to subsume other logging methods such as ll_infos added optional tag output to error recorders
2013-06-10SH-4216 WIP - finished item/cat update and reorg of aisv3 codeBrad Payne (Vir Linden)
2013-06-05merge with viewer-releaseRichard Linden
2013-06-05SH-3635 WIP - COF slammer works in AISv3 regions. Extensive rework of ↵Brad Payne (Vir Linden)
onAISUpdateReceived.
2013-05-24SH-4207 WIP - use item updates with callback when updating link ↵Brad Payne (Vir Linden)
descriptions. Reworked updateAppearanceFromCOF() cof-validation stages.
2013-05-24SH-4027 WIP - initial implementation of item update via AIS.Brad Payne (Vir Linden)
2013-05-21mergeBrad Payne (Vir Linden)
2013-05-05Spring cleaning: removed unused .cpp and.h files, and cleaned up header ↵Richard Linden
dependencies
2013-04-25SH-4137 WIP - added callback-based support for purge descendents, remove ↵Brad Payne (Vir Linden)
category
2013-04-19merge changes for DRTVWR-294Oz Linden
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
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
Most of the merge was clean, a couple conflicts. Brought over a couple patches manually for llpolymesh.
2013-01-15SH-3339 WIP, SH-3645 WIP - added getActualDescription to obviate an ↵Brad Payne (Vir Linden)
obnoxious and widely-used workaround, re-create COF link after wearable edit to force COF version bump
2012-11-14SH-3406 WIP convert fast timers to lltrace systemRichard Linden
cleaning up build moved most includes of windows.h to llwin32headers.h to disable min/max macros, etc streamlined Time class and consolidated functionality in BlockTimer class llfasttimer is no longer included via llstring.h, so had to add it manually in several places
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
reviewed with Simon
2012-09-20Partial rewrite of llifstream and llofstream (Windows implementation ↵Don Kjer
pending). Moved more functionality from llviewerwearable to llwearable
2012-09-13Fleshed out target_link_libraries dependencies between libraries. ↵Don Kjer
Appearance utility now reads avatar_lad.xml during stubbed out params processing.
2012-09-08Removed most llappearance -> llui dependencies (LLTrans remains). Moved ↵Don Kjer
LLInventoryIcon::EIconName into LLInventoryType. Moved LLInventoryIcon back to newview. Moved LLUI gl_* functions into llrender.
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
folders reporting wrong creation date.
2012-07-31merge up to latest viewer-developmentOz Linden
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-21 14:23:13 +0000