summaryrefslogtreecommitdiff
path: root/indra/newview/pipeline.cpp
AgeCommit message (Expand)Author
2013-05-09Merge downstream code / viewer-betasimon
2013-05-09Merge viewer-betasimon
2013-04-19merge changes for DRTVWR-294Oz Linden
2013-04-11Forgot to commit @#! mergesimon
2013-04-11Mergesimon
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2013-03-25Pull and merge downstream code with CHUI viewer-development by way of viewer-...simon
2013-03-25Pull in downstream CHUI code from viewer-developmentsimon
2013-03-11Viewer-chui mergeprep
2013-01-30Pull merge from lindenlab/viewer-developementMerov Linden
2013-01-29MAINT-2288 Fix for physics shapes not showing up on "active" objects.Dave Parks
2013-01-25MAINT-2268 Add right-click->"Mute Particle Owner" featureDave Parks
2013-01-24merging in viewer-beta.Nyx Linden
2013-01-14Merge in viewer-developmentsimon@Simon-PC.lindenlab.com
2012-12-17MAINT-2136 Add "RenderDepthOfFieldInEditMode" to control whether or not to le...Dave Parks
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 alloca...Dave Parks
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 a...prep
2012-11-26MAINT-1958 Fix for crash on OSX when resizing window with deferred rendering ...Dave Parks
2012-11-26MAINT-1958 Fix for crash on OSX when resizing window with deferred rendering ...Dave Parks
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 HUD...William Todd Stinson
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 are...Dave Parks
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 ssh://hg@bitbucket.org/stinson_linden/viewer-beta-drtvwr-...William Todd Stinson
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 re...William Todd Stinson
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