summaryrefslogtreecommitdiff
path: root/indra/llprimitive
AgeCommit message (Collapse)Author
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 ↵Graham Madarasz
make scale accessors get with the program
2013-06-07NORSPEC-233 WIP for individual material param edits across hetero object ↵Graham Madarasz
selections
2013-05-14NORSPEC-102 & Co ReloadedKitty Barnett
2013-05-13NORSPEC-178 NORSPEC-179 NORSPEC-180 made enable/disable handling more ↵Graham Madarasz
consistent and increased max range on repeats per meter
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 ↵Graham Madarasz
applied materials
2013-05-10Fixup merge diffsGraham Madarasz
2013-05-10NORSPEC-102 Rapid materials updates are not smooth to viewer which is ↵Kitty Barnett
editing the object
2013-05-09NORSPEC-164 fix TE copy ctor and operator= to include material pointer in ↵Graham Madarasz
addition to ID
2013-05-09Merge viewer-betasimon
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
default env intensity
2013-04-12Fix issue with alphaNonIndexedNoColorF shader and static init fail on ↵g
default spec color (real source of NORSPEC-94, I think)
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
Written with and Reviewed By Graham
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 ↵Kitty Barnett
isn't sending them
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 ↵Brad Payne (Vir Linden)
and sb system is unavailable, to avoid stale appearance problems
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
Most of the merge was clean, a couple conflicts. Brought over a couple patches manually for llpolymesh.
2013-01-11Initial (largely complete) gamma correct rendering implementation.Geenz
2012-12-18Bypass GCC template stumble by specializing getMaterialField for LLUUIDKitty Barnett
2012-12-17Merge with viewer-materials tipKitty Barnett
2012-12-11MAINT-1028 Fix for gccDave Parks
2012-12-11MAINT-1028 Fix for crash when importing meshes produced by FBX converterDave Parks
2012-12-07Use a single multiplier value for all material fieldsKitty Barnett
2012-12-04Updating the comparison function to not use ascii-character comparison. ↵William Todd Stinson
This will give better sorting when the operator overriden comparators are used.
2012-12-04Implementing string conversion and comparison operator overrides for the ↵William Todd Stinson
LLMaterialID class.
2012-12-03Added LLMaterialMgr::get() to retrieve individual materials (with optional ↵Kitty Barnett
callback)
2012-12-03Started LLMaterialMgr to handle viewer<->region materials communicationKitty Barnett
* refactored LLFloaterDebugMaterials::requestPutMaterials() to use LLMaterialMgr instead * replaced "Object editing" results list with information about the active selection instead