summaryrefslogtreecommitdiff
path: root/indra/llprimitive
AgeCommit message (Collapse)Author
2013-04-30Merge 3.5.1 into MaterialsGraham Madarasz
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-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-27NORSPEC-61 Hook up material parameters to shaders.Dave Parks
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-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-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-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
2012-12-02Refactor LLFloaterDebugMaterials::convertToPrintableMaterialID() as ↵Kitty Barnett
LLMaterialID::asString() so it can be used everywhere
2012-12-02Fixed two minor issues (mDiffuseAlphaMode and mAlphaMaskCutoff were ↵Kitty Barnett
reversed; specular rotation had wrong format specifier)
2012-12-02Pull and merge from https://bitbucket.org/lindenlab/viewer-developmentKitty Barnett
2012-11-29Encapsulate material definitions in LLMaterial and refactor ↵Kitty Barnett
LLFloaterDebugMaterials to use the new class
2012-11-27First pass at re-implementing the POST functionality to query values for ↵William Todd Stinson
selected visible objects.
2012-10-11Adding an additional conversion constructor.William Todd Stinson
2012-10-09Initial pass at getting a list of viewer objects with non-null material IDs.William Todd Stinson
2012-10-03Removing overly verbose debug outputs.William Todd Stinson
2012-09-14Added some initial basic decoding of the material value per face.William Todd Stinson
2012-09-05Merge in latest viewer-developmentsimon@Simon-PC.lindenlab.com
2012-07-30mergeBrad Payne (Vir Linden)
2012-07-24merge to viewer-developmentoOz Linden
2012-07-13fix for SH-3235: Bump maps are not loaded until objects change LODXiaohong Bao
2012-07-12PATH-807: Adding an additional check for if the object is marked as ↵Todd Stinson
volume-detect. Note that this will require Andrew's corresponding server-side change to take effect. However, the viewer change alone should have no neative effect prior to the server being updated.
2012-07-05partial changes for building with the llphysicsextensions source packageOz Linden
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-04-25Removing windows line endings from .h and .cpp files.Todd Stinson
2012-04-18Updating to the latest llphysicextensions pre-built package with the now ↵Todd Stinson
lowercased version of the header file names.
2012-02-29PATH-199: Starting to introducing the pathfinding flags for the object.Todd Stinson
2012-02-29PATH-199: More cleanup of object flags and syncing with definitions from the ↵Todd Stinson
server-side using left-shifted bits instead 0x explicits for better human readability.
2012-02-29SH-2689 FIX - a bit more logging and related cleanup. Somewhat arbitrarily ↵Brad Payne (Vir Linden)
calling this done, although tweaks will be ongoing
2012-02-28PATH-199: Cleaning up code related to object flags so that I can better use ↵Todd Stinson
the flags to managed pathfinding flags such as permanent and character.
2012-01-27BUILDFIX header file capitalizationNyx (Neal Orman)
Will clean this up to be more in line with our standards later
2012-01-26assert fix for mempyNonAliased16 callBrad Payne (Vir Linden)
2011-12-12merge changes for vmrg-204Oz Linden
2011-11-29mergeDave Parks
2011-11-28bumped up MSVC warning level to 3 to catch more stuff that gcc catchesRichard Linden