summaryrefslogtreecommitdiff
path: root/indra/llcommon
AgeCommit message (Collapse)Author
2012-11-20Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
2012-11-20merge changes for DRTVWR-246Oz Linden
2012-11-19merge with viewer-developmentRichard Linden
2012-11-19increment version to 3.4.4Oz Linden
2012-11-16SH-3406 WIP convert fast timers to lltrace systemRichard Linden
got new fast timer code to compile and run
2012-11-16Some Mac header #defines macros like check and equivalent -- gack!!Nat Goodspeed
Given that third-party libraries (such as Boost) can and do use those names, properly namespace-scoped, it's unpardonable to break any such innocent usage with a macro. Given the pervasiveness of the need, introduce a header file with the requisite #undef directives.
2012-11-16Boost 1.52 no longer supports Boost.Filesystem v2 -- don't request.Nat Goodspeed
Instead of compatibility mode, #defining BOOST_FILESYSTEM_VERSION to 2 only gets you a compile error these days.
2012-11-15SH-3406 WIP convert fast timers to lltrace systemRichard Linden
eliminated min and max macros from windows.h got rest of viewer to compile against llfasttimer changes
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-13SH-3406 WIP convert fast timers to lltrace systemRichard Linden
moving fast timers into lltrace namespace and accumulation system
2012-11-13Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
2012-11-13merge changes for DRTVWR-238Oz Linden
2012-11-12SH-3406 WIP convert fast timers to lltrace systemRichard Linden
removed remnants of LLFastTimer::FrameState
2012-11-12SH-3406 WIP convert fast timers to lltrace systemRichard Linden
simplified llfasttimer code down to 2 classes llunit unit conversion now done in floating point or 64 bit integer precision, depending on source type
2012-11-09Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.William Todd Stinson
2012-11-08SH-3499 WIP Ensure asset stats output is correctRichard Linden
Finished making LLUnit implicitly convertible to/from scalar integer values cleaned up test code
2012-11-08Automated merge with http://bitbucket.org/lindenlab/viewer-developmentDave Parks
2012-11-08merge up to viewer-developmentOz Linden
2012-11-07SH-3499 WIP Ensure asset stats output is correctRichard Linden
further fixes to implicit conversion of unit types
2012-11-07Automated merge with http://bitbucket.org/lindenlab/viewer-betaDave Parks
2012-11-07MAINT-1815 Fix for excessive memory usage in Mayfair. Disable tcmalloc. ↵Dave Parks
Disable private memory pools. Make viewer large address aware on windows. Reviewed by Kelly
2012-11-07Merge. Refresh DRTVWR-209 with 3.4.2-beta1 code.Monty Brandenberg
Two fairly simple conflicts: dead stats sending code in the texture fetch code (new llcorehttp library) and the cleanup code in llappviewer was moved around in 3.4.x.
2012-11-07SH-3499 WIP Ensure asset stats output is correctRichard Linden
removed explicit constructor of LLUnit from integral types, as C++ already guarantees that I can't convert from LLUnit<Bytes> to LLUnits<Seconds> (requires 2 user defined conversions). Now this allows seamless replacement of existing integral types with Unit labeled types.
2012-11-07SH-3499 WIP Ensure asset stats output is correctRichard Linden
fixed trace data gathering and routing from background thread simplified slave->master thread communication (eliminated redundant recording and proxy object) improved performance of fast timer data gathering (slow iterators)
2012-11-06Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
2012-11-05SH-3499 WIP Ensure asset stats output is correctRichard Linden
fixed copy behavior of recordings and accumulator buffers
2012-11-05increment version to 3.4.3Oz Linden
2012-11-02SH-3499 Ensure asset stats output is correctRichard Linden
improvements to predicate API default rules encapsulated in LLInitParam removed empty flag from viewer asset stats
2012-11-01SH-3499 Ensure asset stats output is correctRichard Linden
added support for specifying predicates for xui and llsd serialization
2012-11-01SH-3405 FIX convert existing stats to lltrace systemRichard Linden
output of floater_stats is now identical to pre-lltrace system (with some tweaks)
2012-11-01Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting-metricsRichard Linden
2012-11-01SH-3405 FIX convert existing stats to lltrace systemRichard Linden
final removal of remaining LLStat code
2013-03-08merge changes for 3.5.0-beta2Oz Linden
2013-03-04import fix for python sys.path in integration testsOz Linden
2013-02-22linux version number fixesOz Linden
2013-02-21add OS version stringOz Linden
2013-02-13disable tests that fail too often on WindowsOz Linden
2013-02-07derive version number from indra/VIEWER_VERSION.txtOz Linden
2012-10-29SH-3405 WIP convert existing stats to lltrace systemRichard Linden
fixed predicate update logic and reduced to 2 classes
2012-10-26SH-3405 WIP convert existing stats to lltrace systemRichard Linden
fixed llpredicate so that values and rules work uniformly with predicate logic and/or/negate works in parallel with set/clear
2012-10-25SH-3405 WIP convert existing stats to lltrace systemRichard Linden
fixed crash on exit
2012-10-23SH-3405 WIP convert existing stats to lltrace systemRichard Linden
converted "int" to "S32"
2012-10-23SH-3405 WIP convert existing stats to lltrace systemRichard Linden
cleaned up predicate system, made unknown work with remove
2012-10-23SH-3405 WIP convert existing stats to lltrace systemRichard Linden
improved predicate system, added uncertain/unknown predicates
2012-10-22Automated merge with ssh://hg.lindenlab.com/richard/viewer-interestingRichard Linden
2012-10-22SH-3405 WIP convert existing stats to lltrace systemRichard Linden
added return value to serialize function to track if any values were written
2012-10-22SH-3405 WIP convert existing stats to lltrace systemRichard Linden
sanitized param block code to accept isValid and isProvided at any point added predicates to control serialization
2012-10-19SH-3405 WIP convert existing stats to lltrace systemRichard Linden
finished most of conversion of llviewerassetstats ported some param block fixes from viewer-chui converted viewer asset stats to param block format
2012-10-19Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.William Todd Stinson
2012-10-19merge back late fix for MAINT-1753Oz Linden