summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatermodelpreview.cpp
AgeCommit message (Collapse)Author
2011-12-12merge changes for vmrg-204Oz Linden
2011-11-30Automated merge with http://hg.secondlife.com/viewer-developmentRichard Linden
2011-11-29mergeDave Parks
2011-11-28bumped up MSVC warning level to 3 to catch more stuff that gcc catchesRichard Linden
2011-11-24merge changes for vmrg-193Oz Linden
2011-11-22mergeBrad Payne (Vir Linden)
2011-11-21SH-2614 FIX, SH-2684 FIX - fixed buggy state management in onPhysicsUseLODBrad Payne (Vir Linden)
2011-10-19mergeDave Parks
2011-10-19mergeBrad Payne (Vir Linden)
2011-10-14b782a75c99e6 backout cleanupDave Parks
2011-10-13SH-1650 Mitigate memory fragmentation by holding onto and reusing VBOsDave Parks
2011-10-07SH-2488 Fix for shiny and alpha not interacting well on rigged attachments ↵Dave Parks
(and fix for assertion when rendering model import preview)
2011-09-30Fix for sh-2483prep linden
2011-09-28Fix for sh-2500prep
2011-09-26mergeDave Parks
2011-09-26SH-2425 FIX - customized upload permissions info for damballah/stagingBrad Payne (Vir Linden)
2011-09-22mergeBrad Payne (Vir Linden)
2011-09-21Fix for sh-2467prep
2011-09-20SH-2243 No deprecated calls for the whole session.Dave Parks
2011-09-19Fix for sh-2443prep linden
2011-09-16Fix for sh-2443prep linden
2011-09-14SH-2243 work in progress -- application side matrix stack managementDave Parks
2011-09-14mergeBrad Payne (Vir Linden)
2011-09-14mergeprep
2011-09-14Fix for CTS-804. Added support for parsing translations from ↵prep
Blenders(v2.5.9) transform SID's.
2011-09-13mergeDave Parks
2011-09-13SH-2400 FIXED crash on model upload.Seth ProductEngine
Added checks for LoD strings array index bounds.
2011-09-12BUILDFIX GCC fixing unused variableNyx (Neal Orman)
2011-09-08mergeprep
2011-09-08Fix for SH-2210prep
2011-09-08Merge from viewer-experienceLeslie Linden
2011-09-08SH-2309 FIXED 'Triangles limit' combo value updating problem.Seth ProductEngine
Fixed updating 'Error threshold' spinner control visibility.
2011-09-07Merge mesh-development with sh-2309Paul ProductEngine
2011-09-07Merge from seth_mesh_dev to paul_mesh_devPaul ProductEngine
2011-09-06mergeBrad Payne (Vir Linden)
2011-09-06SH-2309 FIXED Priority modifications to mesh uploader UIPaul ProductEngine
- Replaced magic number with constant - Commented my magic numbers
2011-09-02SH-2309 Model preview floater LoD tab updated.Seth ProductEngine
- Combo boxes for LoD source added for each level - New option "Use LoD above" added for copying the model from higher LoDs. - Various LoD settings and related controls removed.
2011-09-02SH-2309 WIP Priority modifications to mesh uploader UIPaul ProductEngine
- Changed representation of Retain% control values - Added "Choose one..." item to the LOD combo_box
2011-09-01SH-2309 WIP Priority modifications to mesh uploader UIPaul ProductEngine
- Bind "Cosine%" param with "Smooth" combo box. - Corrected some wording. - Little UI polish. Line with results in Physics tab. - Changed ordering of LOD combo box items.
2011-08-31MergeXiaohong Bao
2011-08-31SH-2309 WIP Priority modifications to mesh uploader UIPaul ProductEngine
Made next changes according to the last version of UI spec: - Modified Upload Options tab - Modified Physics tab - Modified the floater overall
2011-08-30Fix for Sh-2350prep 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-25SH-2309 WIP Priority modifications to mesh uploader UIPaul ProductEngine
- Updated upload floater according to the UI spec - Updated Modifiers panel according to the UI spec
2011-08-24SH-2309 WIP Priority modifications to mesh uploader UIPaul ProductEngine
- Arranged all controls of the floater (according to the last version of the mockup) except for the tab container content.
2011-08-19MergeSeth ProductEngine
2011-08-18SH-1180 Log which nodes are problematic when loading a .dae with mirrored ↵Dave Parks
meshes and report error.
2011-08-17SH-2217 Fix for large models not getting properly clampled by importer (odd ↵Dave Parks
that server seems to need 240m limit instead of 256m limit)
2011-08-17SH-2285 FIXED Add localization capability to mesh uploader stringsPaul ProductEngine
- Added the convex decomposition strings to the strings.xml - Added names to hardcoded strings.
2011-08-16MergePaul ProductEngine