summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-11-14tag merge of DRTVWR-241Oz Linden
2012-11-14DRTVWR-241: resolve merge conflict with viewer-development.Nat Goodspeed
LLUI::setupPaths() went away with DRTVWR-210.
2012-11-14Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
2012-11-14merge changes for 3.4.2-beta4Oz Linden
2012-11-14tag merge of DRTVWR-210Oz Linden
2012-11-14Added tag 3.4.2-beta4 for changeset 73b84b9864dcOz Linden
2012-11-13DRTVWR-210: sanitize ampersand embedded in strings.xml messagesNat Goodspeed
2012-11-13tag merge of DRTVWR-243Oz Linden
2012-11-13Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
2012-11-13MAINT-1890: Adding a more descriptive comment to this hack fix for future ↵William Todd Stinson
reference.
2012-11-13MAINT-1891: FIX Updating the LLPipeline::clearRebuildGroups() to preserve ↵William Todd Stinson
HUD groups. clearRebuildGroups() is called during the teleport process. In the previous state, HUD objects were being incorrectly removed from the rebuild groups during the teleport process. This change will preserve HUD groups and should resolve this issue.
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-12MAINT-1890: A hacky fix for flexi-prim updates after teleport by ignoring ↵William Todd Stinson
the sUpdateDelay value and simply updating all flexi-prims. This change most likely reduces frame rate.
2012-11-12MAINT-1894: FIX This *should* fix a crash in the LLVolume::resizePath() ↵William Todd Stinson
method. The callstacks indicated that the std library was throwing a length exception on the std::vector::resize() call. Most likely cause was that the recent changes for flexi-prims were causing the mRenderRes to become negative. And thus, the 1<<mRenderRes calculation was generating a really large value for num_render_sections.
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-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-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-06Automated merge with http://hg.secondlife.com/viewer-developmentNat Goodspeed
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-14 23:19:43 +0000