summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2011-09-07Merge from seth_mesh_dev to paul_mesh_devPaul ProductEngine
2011-09-06SH-2309 New icons added to mesh upload floater.Seth ProductEngine
2011-09-06SH-2309 FIXED Priority modifications to mesh uploader UIPaul ProductEngine
- Replaced magic number with constant - Commented my magic numbers
2011-09-05SH-2347 FIXED selecting the value in Stitching Type drop down.Seth ProductEngine
2011-09-05mergeSeth ProductEngine
2011-09-02SH-2171 Commented-out code cleanup.Seth ProductEngine
2011-09-02SH-2309 WIP Label colors changed in mesh upload floater.Seth ProductEngine
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-01mergeBrad Payne (Vir Linden)
2011-09-01Fix for model metricsBrad Payne (Vir Linden)
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-31Automated merge with http://hg.secondlife.com/mesh-developmentXiaohong Bao
2011-08-31fix for SH-2367: Model upload errors are not displayedXiaohong Bao
2011-08-31SH-2314 FIX - change RenderVolumeLODFactor back to 1.125 for low graphicsBrad Payne (Vir Linden)
2011-08-31mergeBrad Payne (Vir Linden)
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-30mergeprep linden
2011-08-30Log error message if material list is not a subset of reference modelprep linden
2011-08-30mergeBrad Payne (Vir Linden)
2011-08-30mergeprep 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-30mergeBrad Payne (Vir Linden)
2011-08-29fix for SH-2311: crash at LLVOVolume::lineSegmentIntersect line 3435Xiaohong Bao
and SH-2358: Crash in LLError::crashAndLoop: Invalid face index
2011-08-29mergBrad Payne (Vir Linden)
2011-08-29increment viewer version to 3.0.4Oz Linden
2011-08-29merge changes for .v-pbOz Linden
2011-08-26Automated merge with https://hg.secondlife.com/mesh-developmentNyx (Neal Orman)
2011-08-26SH-862 FIX re-scaling render weight algorithmNyx (Neal Orman)
We were double-counting the factor of scale both through the streaming cost algorithm, as well as another multiplier in the render cost algorithm. This caused objects at small scales to have little cost difference regardless of amount of geometry, due to minimum costs. Eliminated extra scale factor, and instead scaled number of triangles up by a constant factor to keep the balance between geometry and texture costs sane.
2011-08-26disabled basic inventory root creationRichard Nelson
reviewed by Stone
2011-08-26EXP-1160 FIX Cannot drag/drop items from inventory into the contents of a ↵Richard Nelson
prim in latest Mesh build 239475 brought back some old logic for dispatching to child folder as drag and drop fallback
2011-08-26merge changes for storm-1568Oz Linden
2011-08-26merge changes for storm-1543Oz Linden
2011-08-26STORM-1543 WIP Removed invalid IOR_BUSY response option.Vadim ProductEngine
Addressing review feedback.
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-25merge changes for storm-1268Oz Linden
2011-08-25merge changes for storm-1542Oz Linden
2011-08-25merge changes for storm-1276Oz Linden
2011-08-25merge changes for storm-1571Oz Linden
2011-08-25merge changes for storm-1570Oz Linden
2011-08-24mergeBrad Payne (Vir Linden)
2011-08-24Re-add 3 llinstancetracker tests disabled by changeset 1ead63777bf6.Nat Goodspeed
Fix LLInstanceTracker::key_iter constructor param; accepting InstanceMap::iterator by non-const reference relied on Microsoft extension that accepts non-const reference to an rvalue. Given typical iterator implementation, simply accept by value instead, which makes gcc happy too.
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-23Respect --no-verify-ssl-cert option.Aaron Stone
2011-08-23mergeLogan Dethrow
2011-08-23Fixed LLProxy UI constraints. Fixed some XUI warnings in the Proxy Settings ↵Logan Dethrow
Floater.
2011-08-23SH-2169 ADDITIONAL FIX Fixed SLURL showing context-specific help for object ↵Seth ProductEngine
weights floater.
2011-08-22Fixed a xui widget name mismatch between c++ and xml.Logan Dethrow
2011-08-22SH-2171 ADDITIONAL FIX Added transaction ID to object weights requests to ↵Seth ProductEngine
avoid updating the floater upon outdated or mixed up replies arrival.