summaryrefslogtreecommitdiff
path: root/indra/llprimitive
AgeCommit message (Collapse)Author
2013-04-11Merge in downstream code (chui fixes, materials)simon
2013-04-11Mergesimon
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 ↵Graham Madarasz
fighting with old free call in model loading code
2013-02-26BUILDFIX fixing undefined reference in buildNyx Linden
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-01-30merge downstream code from viewer-lionsimon@Simon-PC.lindenlab.com
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.
2012-12-11MAINT-1028 Fix for gccDave Parks
2012-12-11MAINT-1028 Fix for crash when importing meshes produced by FBX converterDave Parks
2012-10-11Updating linux build to gcc4.6Don Kjer
2012-09-13Fleshed out target_link_libraries dependencies between libraries. ↵Don Kjer
Appearance utility now reads avatar_lad.xml during stubbed out params processing.
2012-09-05Merge in latest viewer-developmentsimon@Simon-PC.lindenlab.com
2012-07-30mergeBrad Payne (Vir Linden)
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-13SH-3267 WIP - extract cof version from avatar appearance message, use to ↵Brad Payne (Vir Linden)
reject stale updates
2012-07-12SH-3267 WIPBrad Payne (Vir Linden)
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-06-28SH-3228 WIP - always respond to processAppearance for self, convert baked ↵Brad Payne (Vir Linden)
textures to checkerboards
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
2011-11-28a try fix for sh-2651: [crashhunters] Crash after google translate failureXiaohong Bao
and sh-2658: crash in LLPluginMessage::parse
2011-11-23SH-2449 Preserve texture scaling when animating textures when "size x" and ↵Dave Parks
"size y" parameters to llSetTextureAnim are zero.
2011-09-27ER-70: from a sim bug, but object can also crash viewer. Fixed NULL. Reviewedsimon@Simon-PC.lindenlab.com
by Kelly
2011-09-14mergeBrad Payne (Vir Linden)
2011-08-30Log error message if material list is not a subset of reference modelprep linden
2011-08-30Handling of material mismatches - lod materials are required to be a subset ↵prep linden
of the high lod, introduced addEmptyFace() for when parity does not exist between model material counts
2011-08-22Merge from viewer-experienceLeslie Linden
2011-08-19mergeBrad Payne (Vir Linden)
2011-08-17convert tabs to spaces where they are forbiddenOz Linden
2011-08-12merge from viewer-experienceLeyla Farazha
2011-08-10merge viewer-development to mesh-developmentBrad Payne (Vir Linden)
2011-08-03Fixes for sh-2039, sh-1336, and sh-2044. Vertices were having incorrect ↵prep
weights assigned.