summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatermodelpreview.cpp
AgeCommit message (Collapse)Author
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
2011-08-15SH-2029 FIX - fix for mac build error, hopefullyBrad Payne (Vir Linden)
2011-08-15SH-2029 FIX - persist the model name in SLMBrad Payne (Vir Linden)
2011-08-15MergePaul ProductEngine
2011-08-12merge from viewer-experienceLeyla Farazha
2011-08-11Added support for parsing of collada 1.4.1 location sidsprep linden
2011-08-10merge viewer-development to mesh-developmentBrad Payne (Vir Linden)
2011-08-10SH-2238, SH-2223, SH-SH-2242 glVertexAttrib throughout main render pipeline ↵Dave Parks
complete, preview renders and debug displays still pending. Also fixed a render glitch and a crash (JIRAs listed).
2011-08-10Joint resolver now constructed from key name (cts-660)prep linden
2011-08-11SH-2064 FIXED 'Upload' button disabled while mesh upload is in progress.Seth ProductEngine
2011-08-09Reports error of a non compatible dae to the log if not 1.4prep linden
2011-08-09Temporarily disallow the upload of non 1.4 dae filesprep linden
2011-08-08mergeDave Parks
2011-08-08SH-2242 Work in progress migrating to glVertexAttrib everywhereDave Parks
2011-08-04SH-2201 Fix for crash when getting mesh estimates.Dave Parks
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-27SH-1868 FIXED Rearranged the accounting info to leave enough room for the ↵Seth ProductEngine
upload permissions warning. Removed hiding the accounting info when warning is displayed.
2011-07-26SH-1086 Make physics shape display transparent and fix some z-fighting issues.Dave Parks
2011-07-25Fix for sh-2162prep
2011-07-25Partial fix for sh-1925.prep
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-20SH-715 Fix for bad "cancel" behavior in physics tab.Dave Parks
2011-07-18mergeDave Parks
2011-07-15Merge from viewer-developmentXiaohong Bao
2011-07-15mergeBrad Payne (Vir Linden)
2011-07-14Fix for SH-2061 model crashes viewer - fixed an issue where a corrupted dae ↵prep
would not disable the calc button
2011-07-14Fix for Sh-2047: Partial joint arrays are now able to uploadprep
2011-07-14SH-715 Disable simplify/analyze button while counterpart is executing.Dave Parks
2011-07-12mergeBrad Payne (Vir Linden)
2011-07-12SH-2043 FIXBrad Payne (Vir Linden)
2011-07-12mergeDave Parks
2011-07-12SH-2053 Don't poke the UI from a background thread -- it tends to get crashy.Dave Parks
2011-07-11Fix for linux build failure, hopefullyBrad Payne (Vir Linden)