summaryrefslogtreecommitdiff
path: root/indra/llcommon
AgeCommit message (Collapse)Author
2011-08-30mergeBrad Payne (Vir Linden)
2011-08-29mergBrad Payne (Vir Linden)
2011-08-29increment viewer version to 3.0.4Oz Linden
2011-08-25merge changes for storm-1571Oz Linden
2011-08-24mergeBrad Payne (Vir Linden)
2011-08-24Re-add 3 llinstancetracker tests disabled by changeset 1ead63777bf6.Nat Goodspeed
Fix LLInstanceTracker::key_iter constructor param; accepting InstanceMap::iterator by non-const reference relied on Microsoft extension that accepts non-const reference to an rvalue. Given typical iterator implementation, simply accept by value instead, which makes gcc happy too.
2011-08-23mergeLogan Dethrow
2011-08-22mergeBrad Payne (Vir Linden)
2011-08-22increment viewer version to 3.0.3Oz Linden
2011-08-18Merge.Logan Dethrow
2011-08-18mergeBrad Payne (Vir Linden)
2011-08-18mergeRichard Nelson
2011-08-18Automated merge with http://hg.secondlife.com/viewer-developmentRichard Nelson
2011-08-18EXP-1107 FIX Crash in LLFastTimer::NamedTimer::accumulateTimingsRichard Nelson
2011-08-17EXP-700 FIX SLPlugin(s) takes high CPU%callum
Reviewed by Richard.
2011-08-15merge late 3.0.1 beta candidate fixesOz Linden
2011-08-15mergeBrad Payne (Vir Linden)
2011-08-15increment viewer version to 3.0.1Oz Linden
2011-08-11Automated merge with http://hg.secondlife.com/viewer-developmentRichard Linden
2011-08-11Automated merge with file:///e:\code\viewer-experienceRichard Linden
2011-08-10merge viewer-development to mesh-developmentBrad Payne (Vir Linden)
2011-08-10added fast timers to profile inventory LLSD deserializationRichard Nelson
2011-08-08mergeLogan Dethrow
2011-08-08Fixed numerous comment spelling errors in llerror.cpp and llerror.hLogan Dethrow
2011-08-08increment viewer version to 3.0.1Oz Linden
2011-08-08correct version number typoOz Linden
2011-08-08increment viewer version to 3.0.0Oz Linden
2011-08-05SH-2218 FIX -- v2.8.x Viewers crash consistently when I actively use other ↵Leslie Linden
applications * Mac memory stats now extracted from proper system calls. Reviewed by Nat Linden.
2011-08-04merge changes for SH-2218Oz Linden
2011-08-04merge changes for SH-2218Oz Linden
2011-08-04Sync with viewer-developmentMerov Linden
2011-08-04merge changes for storm-1538Oz Linden
2011-08-04correct default channelOz Linden
2011-08-04fix DOS line endingsOz Linden
2011-08-03SH-2218 WORK AROUND -- v2.8.x Viewers crash consistently when I actively use ↵Leslie Linden
other applications * Just removed mac memory stats to make a low-risk work-around.
2011-08-03New header for accounting costsprep linden
2011-08-02Pull from richard/viewer-experienceMerov Linden
2011-08-02Sync with lindenlab/viewer-developmentMerov Linden
2011-08-02pulling latest viewer-development into mesh merge branch.Nyx (Neal Orman)
2011-08-02Sh-2129 Viewer caps implementation for resource cost selected. Also cleanup ↵prep linden
of old code related to earlier accounting work.
2011-08-01increment viewer version to 2.8.4Oz Linden
2011-07-28MergeLogan Dethrow
2011-07-27Swap typename and const.Aaron Stone
2011-07-27another potential gcc fixRichard Nelson
2011-07-27fix for gccRichard Nelson
2011-07-27broken operator= semantics for instance tracker iteratorsRichard Nelson
2011-07-27 another fix for buildRichard Nelson
2011-07-26fixed buildRichard Nelson
2011-07-26mergeRichard Nelson
2011-07-26removed last vestiges of llinstancetracerscopedguardRichard Nelson
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-20 18:20:29 +0000