summaryrefslogtreecommitdiff
path: root/indra/newview/pipeline.cpp
AgeCommit message (Collapse)Author
2013-03-11Viewer-chui mergeprep
2013-01-30Pull merge from lindenlab/viewer-developementMerov Linden
2013-01-24merging in viewer-beta.Nyx Linden
Most of the merge was clean, a couple conflicts. Brought over a couple patches manually for llpolymesh.
2012-12-12Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.William Todd Stinson
2012-12-12Pull and merge viewer-developmentsimon@Simon-PC.lindenlab.com
2012-12-11Automated merge with ssh://bitbucket.org/lindenlab/viewer-developmentLogan Dethrow
2012-12-04Fix merge breakagesimon@Simon-PC.lindenlab.com
2012-12-04Pull in upstream viewer-development via viewer-lionsimon@Simon-PC.lindenlab.com
2012-12-04Pull and merge viewer-developmentsimon@Simon-PC.lindenlab.com
2012-11-30MAINT-1958 Trivial change to kick teamcity into behaving.Dave Parks
2012-11-30MAINT-1958 More robust error handling -- handle the case where the FBO ↵Dave Parks
allocation failure occurs when enabling lighting and shadows.
2012-11-30MAINT-1958 Fix for linux build after transplant.Dave Parks
2012-11-28SH-3563. Pull and merge from viewer-development. Modest code changes to fix ↵prep
alignment issue in llAppearance.
2012-11-26MAINT-1958 Fix for crash on OSX when resizing window with deferred rendering ↵Dave Parks
enabled. Reviewed by VoidPointer
2012-11-26MAINT-1958 Fix for crash on OSX when resizing window with deferred rendering ↵Dave Parks
enabled. Reviewed by VoidPointer
2012-11-20Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.William Todd Stinson
2012-11-20Automated merge with https://bitbucket.org/lindenlab/viewer-developmentDave Parks
2012-11-14Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.William Todd Stinson
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-09Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.William Todd Stinson
2012-11-08Automated merge with http://bitbucket.org/lindenlab/viewer-lionDave Parks
2012-11-08Automated merge with http://bitbucket.org/lindenlab/viewer-developmentDave Parks
2012-10-19Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.William Todd Stinson
2012-10-19pull back changes from 3.4.1-beta9Oz Linden
2012-10-17MAINT-1527 Fix for crash on exit when VBO disabledDave Parks
2012-10-17Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/.William Todd Stinson
2012-10-17MAINT-643 Cleanup some shader compilation errors when atmospheric shaders ↵Dave Parks
are enabled.
2012-10-15Merge in viewer-development code and fix buildsimon@Simon-PC.lindenlab.com
2012-10-11Updating linux build to gcc4.6Don Kjer
2012-09-23Removing unused gHeadlessClient code from viewerDon Kjer
2012-09-20Pull and merge from ↵William Todd Stinson
ssh://hg@bitbucket.org/stinson_linden/viewer-beta-drtvwr-179.
2012-09-20reapply 448b02f5b56f: MAINT-1147 Fix for frame stall on region crossing.Dave Parks
2012-09-20reapply 52b6c9168974: MAINT-646 Factor std::set out of lloctreeDave Parks
2012-09-20reapply 38b7779af5f9: MAINT-646 Faster traversal of render batch lists.Dave Parks
2012-09-10Backing out the changes contributing to DRTVWR-167 and DRTVWR-179 from the ↵William Todd Stinson
repository.
2012-11-14merge changes for 3.4.2-beta4Oz Linden
2012-10-22LLDrawable::destroy: Illegal deletion of LLDrawable!Nicky
2012-09-05Merge in latest viewer-developmentsimon@Simon-PC.lindenlab.com
2012-08-22mergeBrad Payne (Vir Linden)
2012-08-16merge up to latest viewer-developmentOz Linden
2012-08-15merge changes for DRTVWR-194Oz Linden
2012-08-09Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-development.Todd Stinson
2012-08-09Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta.Todd Stinson
2012-08-08mergeBrad Payne (Vir Linden)
2012-08-02Merge viewer-horde-fixes -> sunshineDon Kjer
2012-07-31Merge in viewer-developmentsimon@Simon-PC.lindenlab.com
2012-07-31merge up to latest viewer-developmentOz Linden
2012-07-30CHUI-217 FIX Items are not visible in Merchant OutboxRichard Linden
cleaned up a lot custom code for folder view item creation in inbox and outbox proper initialization of views from inventory panel starting folder
2012-07-30mergeBrad Payne (Vir Linden)
2012-07-30mergeBrad Payne (Vir Linden)
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 06:27:38 +0000