summaryrefslogtreecommitdiff
path: root/indra/llprimitive
AgeCommit message (Expand)Author
2014-01-27MAINT-3661 Fix for crash when uploading corrupt .dae file.Dave Parks
2013-09-23MAINT-3179 fix bad indexing of position info generating false alarms on range...Graham Linden
2013-09-16MAINT-3153 fix potential mis-indexing in DAE loading checksGraham Linden
2013-09-16MAINT-2388 replace stomped fix to not crash when handed bogus model dataGraham Linden
2013-06-27Automated merge with https://bitbucket.org/lindenlab/viewer-development-mater...Dave Parks
2013-06-21Automated merge with file:///F:%5Cviewer-bearDave Parks
2013-06-20Automated merge with http://bitbucket.org/lindenlab/viewer-releaseDave Parks
2013-06-15NORSPEC-267 fix UI feedback for materials edits not appearing for observers w...Graham Linden
2013-06-08NORSPEC-233 fix default value and material apply logic errorsGraham Madarasz
2013-06-07NORSPEC-233 WIP fix completely bogus substitution of offsets for scales and m...Graham Madarasz
2013-06-07NORSPEC-233 WIP for individual material param edits across hetero object sele...Graham Madarasz
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-12Merged with viewer-dev-materialsKitty Barnett
2013-05-11Fix many issues with selection misapplication and rendering not matching appl...Graham Madarasz
2013-05-10Fixup merge diffsGraham Madarasz
2013-05-10NORSPEC-102 Rapid materials updates are not smooth to viewer which is editing...Kitty Barnett
2013-05-09NORSPEC-164 fix TE copy ctor and operator= to include material pointer in add...Graham Madarasz
2013-05-09Mergesimon
2013-05-09Merge downstream code and viewer-betasimon
2013-05-09Merge viewer-betasimon
2013-05-07Automated merge with https://bitbucket.org/lindenlab/viewer-catDave Parks
2013-05-07Optimization -- don't draw glow in alpha pool unless neededDave Parks
2013-05-07Merge vwr-dev-matGraham Madarasz
2013-05-06NORSPEC-162 Fix for objects with materials set ignoring "tranparency %" value.Dave Parks
2013-05-01Merge vwr-dev-matGraham Madarasz
2013-04-30Merge 3.5.1 into MaterialsGraham Madarasz
2013-04-25Merge 3.5.1 into MaterialsGraham Madarasz
2013-04-19merge changes for DRTVWR-294Oz Linden
2013-04-17Merge with latest viewer-dev-materials.Geenz
2013-04-17NORSPEC-90 Alpha pool hookups for materials.Dave Parks
2013-04-16NORSPEC-123 et al...roll back NSPEC 91 fix to avoid knock-on and set correct ...Graham Madarasz
2013-04-12Fix issue with alphaNonIndexedNoColorF shader and static init fail on default...g
2013-04-11Forgot to commit @#! mergesimon
2013-04-11Merge in downstream code (chui fixes, materials)simon
2013-04-11Mergesimon
2013-04-08NORSPEC-82 NORSPEC-85 More UI shenanigansGraham Madarasz (Graham)
2013-04-08NORSPEC-82 NORSPEC-85 More UI shenanigansGraham Madarasz (Graham)
2013-04-03NORSPEC-71 Lots more UI hookupsDave Parks
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2013-03-27NORSPEC-61 Hook up material parameters to shaders.Dave Parks
2013-03-11mergeprep
2013-03-07Remove redundant data validation copy-pasted into normals loopGraham Madarasz (Graham)
2013-03-07For MAINT-2436 and MAINT-2388 contribs from STORM-1935 and STORM-1936Graham Madarasz (Graham)
2013-03-06Fix crashes from using single alloc for pos/norm/tc in volume face data fight...Graham Madarasz
2013-02-26BUILDFIX fixing undefined reference in buildNyx Linden
2013-02-25Added LLMaterialMgr::remove() to remove material information from a faceKitty Barnett
2013-02-20clean up some debug logging, add comment on llassertOz Linden
2013-02-19Don't overrun the message buffer extracting materials ids when the region isn...Kitty Barnett