summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerobject.cpp
AgeCommit message (Expand)Author
2013-05-14NORSPEC-102 & Co ReloadedKitty Barnett
2013-05-13NORSPEC-178 NORSPEC-179 NORSPEC-180 made enable/disable handling more consist...Graham Madarasz
2013-05-12LLMaterialMgr::get() doesn't handle a callback request for LLMaterialID::nullKitty Barnett
2013-05-11Merge viewer-dev-materials and bugfix in LLPanelFace::getState using material...Graham Madarasz
2013-05-11Fix many issues with selection misapplication and rendering not matching appl...Graham Madarasz
2013-05-11merge latest integration repo changesOz Linden
2013-05-11Merge vwr-dev-matGraham Madarasz
2013-05-10Put back normal map and spec map initializers/destruction, delete FMOD refs (...Graham Madarasz
2013-05-10merge changes for 3.5.2-beta5Oz Linden
2013-05-10merge changes for 3.5.2-beta4Oz Linden
2013-05-09MAINT-2647 Fix for some objects not rendering until first LoD switch/selection.Dave Parks
2013-05-08merge changes for 3.5.1-releaseOz Linden
2013-05-04Remove unnecessary assert as ternary protects against null ptr derefGraham Madarasz
2013-05-04Remove unnecessary assert as ternary protects against null ptr derefGraham Madarasz
2013-05-03NORSPEC-160 fix trashing of spec map from sunshine integration snafuGraham Madarasz (Graham)
2013-05-03NORSPEC-160 fix trashing of spec map from sunshine integration snafuGraham Madarasz (Graham)
2013-05-01Merge vwr-dev-matGraham Madarasz
2013-04-30Fix gcc ternary type inference fail to unbreak Mac and Linux buildsGraham Madarasz
2013-04-30Merge 3.5.1 into MaterialsGraham Madarasz
2013-04-30Fix vwr-dev-mat merge bugs in llpanelface (missing Oz fix) and XMLGraham Madarasz
2013-04-25Merge 3.5.1 into MaterialsGraham Madarasz
2013-04-19merge changes for DRTVWR-294Oz Linden
2013-04-17SUN-70 MAINT-2597 FIX Crash when trying to edit no-modify objectsNyx Linden
2013-04-03NORSPEC-71 Lots more UI hookupsDave Parks
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2013-03-11mergeprep
2013-03-08SH-3959 WIP - pass information about type of fetched image - server bake, hos...Brad Payne (Vir Linden)
2013-02-15fix crasher in setNumTEsOz Linden
2013-02-12merge up to 3.4.5-releaseOz Linden
2013-02-04improve and clarify loggingOz Linden
2013-01-30SH-3800 WIP - logic to detect baked textures being sought in the wrong place,...Brad Payne (Vir Linden)
2013-01-30Specular map support. This is the vast majority of the material parameters i...Geenz
2013-01-28Basic normal mapping support.Geenz
2013-01-25setMaterialParams for LLViewerObjectGeenz
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-11-21Pull and merge https://bitbucket.org/lindenlab/viewer-development.William Todd Stinson
2012-11-13Pull and merge from https://bitbucket.org/lindenlab/viewer-development.William Todd Stinson
2012-11-09MAINT-1755: Correcting behavior when llTargetOmega is called with zero spin r...William Todd Stinson
2012-11-09Pull and merge from https://bitbucket.org/lindenlab/viewer-development.William Todd Stinson
2012-11-08MAINT-1228, MAINT-1668: Deleting code that had been originally deleted to fi...William Todd Stinson
2012-11-08Automated merge with http://bitbucket.org/lindenlab/viewer-developmentDave Parks
2012-11-06Pull and merge from https://bitbucket.org/lindenlab/viewer-development.William Todd Stinson
2012-11-06Pull and merge from https://bitbucket.org/lindenlab/viewer-development.William Todd Stinson
2012-11-05merge changes for DRTVWR-217Oz Linden
2012-10-25MergeKelly Washington
2012-10-15MAINT-1672: Correcting issue where the sailboat boom was not moving correctly...William Todd Stinson
2012-10-15Merge in viewer-development code and fix buildsimon@Simon-PC.lindenlab.com