summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
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-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-05pull back DRTVWR-217 and tag for 3.4.2-beta1Oz 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-05increment version to 3.4.3Oz 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-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
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-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-26MAINT-1709 Fix for >> that should have been > >Dave Parks
2012-10-25SH-3405 WIP convert existing stats to lltrace systemRichard Linden
fixed crash on exit
2012-10-25MergeKelly Washington
2012-10-24pull back changes (enable tcmalloc) from 3.4.1-beta10Oz Linden
2012-10-24disable tcmalloc againOz Linden
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-23Allow user to override either English, or localized, skinned file.Nat Goodspeed
Original LLDir::findSkinnedFilenames() implementation used a tricky rule: a given skin directory was only considered if it provided a default-language override for the sought filename, regardless of whether it also provided localizations for that filename. Discussion with Richard clarifies that we want to allow the user to override neither, either or both. Change findSkinnedFilenames() accordingly; update unit tests to verify new semantics.
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-22LLDrawable::destroy: Illegal deletion of LLDrawable!Nicky
2012-10-23correct faulty mergeOz Linden
2012-10-22Enable tcmallocDave Parks
2012-10-22Trying original version of GBP with new scripts/code- revert corresponding ↵callum_linden
cpp code
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-20Removing build.sh darwin symbols hack. Adding '-g' to both CFLAGS and ↵Don Kjer
CXXFLAG to have cmake generation debug symbols in xcode.
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