summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-11-13Pull and merge from https://bitbucket.org/lindenlab/viewer-development.William Todd Stinson
2012-11-13merge changes for DRTVWR-238Oz Linden
2012-11-13tag merge of DRTVWR-238Oz Linden
2012-11-13merge changes for DRTVWR-209Oz Linden
2012-11-13tag merge of DRTVWR-209Oz Linden
2012-11-09pull back 3.4.2-beta3 fixesOz Linden
2012-11-09Added tag 3.4.2-beta3 for changeset 710785535362Oz Linden
2012-11-09tag merge of DRTVWR-242Oz Linden
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-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-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-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-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-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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 06:00:45 +0000