summaryrefslogtreecommitdiff
path: root/indra/newview/llface.cpp
AgeCommit message (Expand)Author
2013-05-10Fixup merge diffsGraham Madarasz
2013-05-06NORSPEC-126 Make objects with normal maps applied obey legacy shiny settingsGraham Madarasz
2013-05-03NORSPEC-151 make disabling bumpyshiny disable adv lighting model as wellGraham Madarasz (Graham)
2013-05-03Merge with vwr-dev-matGraham Madarasz (Graham)
2013-05-02NORSPEC-149 Fix for objects set to alpha blend sometimes getting tossed into ...Dave Parks
2013-04-26Merge vwr-dev-matGraham Madarasz
2013-04-25Merge 3.5.1 into MaterialsGraham Madarasz
2013-04-25NORSPEC-104 Fix for texture animation sometimes not overriding specular and n...Dave Parks
2013-04-19merge changes for DRTVWR-294Oz Linden
2013-04-10NORSPEC-75 Add appropriate draw calls to underwater render passes so objects ...Dave Parks
2013-03-29NORSPEC-66 Hook up material parameters to rigged attachments.Dave Parks
2013-03-29NORSPEC-65 Hook up texture offset/scale/rotation for normal and specular maps.Dave Parks
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2013-03-25NORSPEC-54 Potential fix for crashing on all sorts of random operations.Dave Parks
2013-02-12merge up to 3.4.5-releaseOz Linden
2013-01-30Specular map support. This is the vast majority of the material parameters i...Geenz
2013-01-25Trying to set materials up for rendering! Yay!Geenz
2013-01-24merging in viewer-beta.Nyx Linden
2012-12-04Pull and merge viewer-developmentsimon@Simon-PC.lindenlab.com
2012-11-28SH-3563. Pull and merge from viewer-development. Modest code changes to fix a...prep
2012-10-15Merge in viewer-development code and fix buildsimon@Simon-PC.lindenlab.com
2012-09-20Pull and merge from ssh://hg@bitbucket.org/stinson_linden/viewer-beta-drtvwr-...William Todd Stinson
2012-09-20reapply 04fdf7945708: MAINT-775 Fix for particle index pool corruption on tel...Dave Parks
2012-09-20reapply c77cea5c6e41: MAINT-646 Cleanup some warnings from previous changes.Dave Parks
2012-09-20reapply 52b6c9168974: MAINT-646 Factor std::set out of lloctreeDave Parks
2012-09-12Fixing merge conflicts related to restoring DRTVWR-167 changesBrad Payne (Vir Linden)
2012-09-10Backing out the changes contributing to DRTVWR-167 and DRTVWR-179 from the re...William Todd Stinson
2012-09-05Merge in latest viewer-developmentsimon@Simon-PC.lindenlab.com
2012-09-04Split gl-specific LLViewerTexture implementation into llrender/LLGLViewerTextureDon Kjer
2012-07-30mergeBrad Payne (Vir Linden)
2012-07-30mergeBrad Payne (Vir Linden)
2012-07-17pull back fixes for 3.3.4-beta4Oz Linden
2012-07-16MAINT-1223 Fix for alpha updates not triggering LoD updates.Dave Parks
2012-07-14merge back beta fixes for DRTVWR-180Oz Linden
2012-07-11Pull in viewer-development because it's painful. Merge with runitai's help.simon@Simon-PC.lindenlab.com
2012-07-11MAINT-794 Fix for assert on loading some types of objects before their parents.Dave Parks
2012-07-06trivial: convert to Unix line endings.Xiaohong Bao
2012-08-01Merge back viewer-lion, which has viewer-development and down-stream fixessimon@Simon-PC.lindenlab.com
2012-07-20MAINT-570 Remove unused memory tracking system LLMemTypeDave Parks
2012-07-11MAINT-794 Fix for assert on loading some types of objects before their parents.Dave Parks
2012-06-27merge changes for DRTVWR-167Oz Linden
2012-06-15MAINT-775 Fix for particle index pool corruption on teleport.Dave Parks
2012-06-14MAINT-646 Cleanup some warnings from previous changes.Dave Parks
2012-06-14fix for MAINT-758: [PUBLIC]texture discard level is inconsistent between sess...Xiaohong Bao
2012-06-05MAINT-646 Factor std::set out of lloctreeDave Parks
2012-06-04mergeBrad Payne (Vir Linden)
2012-06-04mergeBrad Payne (Vir Linden)
2012-05-31MAINT-639 Fix for random rainbow effects on some prims.Dave Parks
2012-10-22Crashfix; Guard against 0 pointer textures.Nicky
2012-05-29fo SH-3074: clear ghost and stale texture fetching requests in time.Xiaohong Bao