summaryrefslogtreecommitdiff
path: root/indra/llprimitive
AgeCommit message (Collapse)Author
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
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.
2011-07-29mergeprep linden
2011-07-29Removed joint Positional Compare because it was crashing on some rigsprep linden
2011-07-29BUILDFIX: fixing build for linux, casting doubles as parameters to absnyx
2011-07-29merging in PE's fixes for new UI to mesh-development.nyx
Included are upload floater tweaks, build panel tweaks, and removing the mesh enabled checkbox in region tools.
2011-07-28Fix for sh-2044, sh-2039 and sh-2166 (Avatar weights were sometimes not ↵prep
correctly applied upon import.
2011-07-22SH-1868 WIP Added user-supplied metric data for uploading a model.seth_productengine
The mesh category string selected by user within the model data and sent to the server during calculating the upload fee and upload requests. The accounting info and the upload permissions warning in the bottom left corner of the floater are temporarily made mutually exclusive.
2011-07-20fix for sh-1847: Removed assert when a vert is outside [-5,5] domainprep
2011-07-19addendum to prim fixBrad Payne (Vir Linden)
2011-07-19Cherry pick of ↵Brad Payne (Vir Linden)
https://bitbucket.org/lindenlab/mesh-development/changeset/9cea44ebea3b by don, to fix old viewer crashes in mesh regions
2011-07-18Changed mesh param type to not conflict with one in-use on serverDon Kjer
2011-07-18Adding support for viewer reading mesh params from an alternative param type.Don Kjer
2011-07-14SH-715 Disable simplify/analyze button while counterpart is executing.Dave Parks
2011-07-08SH-2008 Fix for crash when generating normals on objects with no texture ↵Dave Parks
coordinates.
2011-07-07SH-1774 Fix for preserving material assignments between multiple custom LoDs.Dave Parks
2011-07-06SH-1972 Fix for slm messing up physics shape on second upload.Dave Parks
2011-07-06Fix for "set to default" button not resetting some data.Dave Parks
2011-06-28SH-1169 Fix for convex decompositions not working post ↵Dave Parks
mesh-asset-deprecation work. (also default SLM usage to on)
2011-06-24fix for SH-1878: Viewer hang in GLOD_Group::adaptTriangleBudget during ↵Xiaohong Bao
LLModelPreview::genLODs; SH-1891: viewer crashes while previewing "RYOMA 3D XML File.dae"; SH-1890: Crash loading palm tree
2011-06-22SH-1815 Fix for crash when using old version slmDave Parks