summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-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-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-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-01Added tag 3.4.1-beta12 for changeset 853a20242639Oz Linden
2012-11-01tag merge of DRTVWR-237Oz Linden
2012-11-01Automated merge with http://bitbucket.org/lindenlab/viewer-betaDave Parks
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-30Added tag 3.4.1-beta11 for changeset 18498afcdb83Oz Linden
2012-10-30merge changes for DRTVWR-236Oz Linden
2012-10-30tag merge of DRTVWR-236Oz Linden
2012-10-30merge changes for DRTVWR-235Oz Linden
2012-10-30tag merge of DRTVWR-235Oz Linden
2012-10-26MAINT-1709 Fix for >> that should have been > >Dave Parks
2012-10-25MergeKelly Washington
2012-10-24pull back changes (enable tcmalloc) from 3.4.1-beta10Oz Linden
2012-10-24Added tag 3.4.1-beta10 for changeset 4e0d84e92132Oz Linden
2012-10-24disable tcmalloc againOz Linden
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-22whitespace change to force new build in TCcallum_linden
2012-10-22LLDrawable::destroy: Illegal deletion of LLDrawable!Nicky
2012-10-23correct faulty mergeOz Linden
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 19:10:19 +0000