summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-11-09tag merge of DRTVWR-242Oz Linden
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-08for SH-3472: prioritize object loadingXiaohong Bao
2012-11-08MAINT-1228, MAINT-1668: Deleting code that had been originally deleted to ↵William Todd Stinson
fix these issues, but then was accidentally re-introduced during a bad merge.
2012-11-08merge changes for DRTVWR-240Oz Linden
2012-11-08tag merge of DRTVWR-240Oz Linden
2012-11-08merge up to viewer-developmentOz Linden
2012-11-08Trivial commit to force TeamCity to generate a new codeticket numberNat Goodspeed
2012-11-08Trivial commit to force TeamCity to generate a new codeticket numberNat Goodspeed
2012-11-07SH-3499 WIP Ensure asset stats output is correctRichard Linden
further fixes to implicit conversion of unit types
2012-11-07INTL-46 massive Chinese translation update for set28--set34, including new fileseli
2012-11-07sync with viewer-development (for 1 DE file)eli
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-07merge changes for 3.4.2-beta2Oz Linden
2012-11-07Added tag 3.4.2-beta2 for changeset e664473c16dfOz Linden
2012-11-07tag merge of DRTVWR-216Oz Linden
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-06Simple change to force a new codeticket number.William Todd Stinson
2012-11-06Simple change to force a new codeticket number.William Todd Stinson
2012-11-06Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
2012-11-06Pull and merge from https://bitbucket.org/lindenlab/viewer-development.William Todd Stinson
2012-11-06Pull and merge from https://bitbucket.org/lindenlab/viewer-development.William Todd Stinson
2012-11-06Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.William Todd Stinson
2012-11-06Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
2012-11-06merge changes for DRTVWR-223Oz Linden
2012-11-06tag merge of DRTVWR-223Oz Linden
2012-11-06merge changes for DRTVWR-208Oz Linden
2012-11-06tag merge of DRTVWR-208Oz Linden
2012-11-06pull back changes from 3.4.2-beta1Oz Linden
2012-11-05SH-3499 WIP Ensure asset stats output is correctRichard Linden
fixed copy behavior of recordings and accumulator buffers
2012-11-05pull back DRTVWR-217 and tag for 3.4.2-beta1Oz Linden
2012-11-05Added tag 3.4.2-beta1 for changeset 704bbae7b182Oz Linden
2012-11-05STEAM-14: login when user presses Enter at username or password.Nat Goodspeed
The tricky thing about this fix is that the "Log In" button used to be in the same layout_panel as the username and password fields. Now it's not, so the fact that it's the default button for its layout_panel doesn't matter because that layout_panel doesn't have focus. Richard pointed out that we can make the commit action for the username and password fields initiate login -- as long as neither field implicitly runs its commit action when it loses focus!
2012-11-05merge changes for DRTVWR-217Oz Linden
2012-11-05tag merge of DRTVWR-217Oz Linden
2012-11-05increment version to 3.4.3Oz Linden
2012-11-05pull back release tagOz Linden
2012-11-05Added tag 3.4.1-release for changeset e59ffd3fe083Oz Linden
2012-11-05merge up to latest viewer-developmentOz 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-02merge back fixes from 3.4.1-beta12Oz Linden
2012-11-02Added tag 3.4.1-beta12 for changeset 3f9be82de642Oz Linden
2012-11-02whitespace change to force new build numberOz Linden
2012-11-02Added tag 3.4.1-beta12 for changeset b6b68f3c2c6dOz Linden
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-01Added tag 3.4.1-beta12 for changeset 853a20242639Oz Linden
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-23 07:59:04 +0000