summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2012-11-09MAINT-1755: Correcting behavior when llTargetOmega is called with zero spin ↵William Todd Stinson
rate.
2012-11-09Pull and merge from https://bitbucket.org/lindenlab/viewer-development.William Todd Stinson
2012-11-09pull back 3.4.2-beta3 fixesOz 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-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-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-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-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-06merge changes for 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-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-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-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 http://bitbucket.org/lindenlab/viewer-betaDave Parks
2012-11-01SH-3405 FIX convert existing stats to lltrace systemRichard Linden
final removal of remaining LLStat code
2012-10-31MAINT-646 Fix for leak introduced by optimizations.Dave Parks
2012-10-30pull back changes from 3.4.1-beta11Oz Linden
2012-10-30merge changes for DRTVWR-236Oz Linden
2012-10-30merge changes for DRTVWR-235Oz Linden
2012-10-25MergeKelly Washington
2012-10-22LLDrawable::destroy: Illegal deletion of LLDrawable!Nicky
2012-10-23correct faulty mergeOz Linden
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
removed spam and dead code
2012-10-20SH-3405 WIP convert existing stats to lltrace systemRichard Linden
fixed build
2012-10-20Adding expanded searching for symbols during google breakpad symbol scanDon Kjer
2012-10-19SH-3405 WIP convert existing stats to lltrace systemRichard Linden
removed spam and dead code
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 back changes from 3.4.1-beta9Oz Linden
2012-10-18SH-3405 WIP convert existing stats to lltrace systemRichard Linden
created param block skeleton for asset stats removed most of llviewerassetstats logic
2012-10-18SH-3405 WIP convert existing stats to lltrace systemRichard Linden
fixed trace recording on background threads hitting null pointer
2012-10-17SH-3405 WIP convert existing stats to lltrace systemRichard Linden
started conversion of llviewerassetstats removed old, dead LLViewerStats code made units tracing require units declaration clean up of units handling
2012-10-17MAINT-1527 Fix for crash on exit when VBO disabledDave Parks