summaryrefslogtreecommitdiff
path: root/indra/llprimitive
AgeCommit message (Expand)Author
2013-08-19MergeXiaohong Bao
2013-08-14BUILDFIX: converted platform-specific files over to new LL_INFOS, etc macrosRichard Linden
2013-08-09second phase summer cleaningRichard Linden
2013-07-31BUILDFIX: bad quotesRichard Linden
2013-07-30Summer cleaning - removed a lot of llcommon dependencies to speed up build timesRichard Linden
2013-07-19BUILDFIX: #include and dependency cleanupRichard Linden
2013-06-20merge with releaseRichard Linden
2013-06-20Automated merge with http://bitbucket.org/lindenlab/viewer-releaseDave Parks
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-06-05merge with viewer-releaseRichard Linden
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-09Merge viewer-betasimon
2013-05-07Merge vwr-dev-matGraham Madarasz
2013-05-06SH-4080 WIP interesting: random crash on MacRichard Linden
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-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-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
2013-02-15additional safety check for bad appearance messagesBrad Payne (Vir Linden)
2013-02-13SH-3812 WIP, SH-3852 WIP - some metrics cleanup, added rebake when needed and...Brad Payne (Vir Linden)
2013-02-12merge up to 3.4.5-releaseOz Linden
2013-02-01add debug logging, ostream support for material ids, and some minor cleanupOz Linden
2013-01-25Trying to set materials up for rendering! Yay!Geenz
2013-01-24merging in viewer-beta.Nyx Linden
2013-01-11Initial (largely complete) gamma correct rendering implementation.Geenz