summaryrefslogtreecommitdiff
path: root/indra
AgeCommit message (Collapse)Author
2011-09-13mergeNyx (Neal Orman)
2011-09-13SH-2420 FIX update labeling in about land floaterNyx (Neal Orman)
About land was still referring to the capacity of land in terms of "prims" The new terminology refers to this as land capacity, so that we can get away from the "prim equivalent" terms, as they are confusing.
2011-09-12BUILDFIX GCC fixing unused variableNyx (Neal Orman)
2011-09-08mergeprep
2011-09-08Fix for SH-2210prep
2011-09-08Automated merge with https://bitbucket.org/paul_productengine/sh-2309Seth ProductEngine
2011-09-08SH-2309 FIXED 'Triangles limit' combo value updating problem.Seth ProductEngine
Fixed updating 'Error threshold' spinner control visibility.
2011-09-07SH-2371 FIXED "Not allowed to upload message" flashes when uploader dialog ↵Paul ProductEngine
comes up - This is a regression bug caused by changeset:20407
2011-09-07Merge mesh-development with sh-2309Paul ProductEngine
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-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-05SH-2347 FIXED selecting the value in Stitching Type drop down.Seth ProductEngine
2011-09-05mergeSeth ProductEngine
2011-09-02merge changes for storm-1027Oz Linden
2011-09-02re-write the hash table code to eliminate potential flaws and simplify the ↵Xiaohong Bao
implementation.
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-02increment viewer version to 3.0.5Oz Linden
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-31Automated merge with http://hg.secondlife.com/viewer-developmentXiaohong Bao
2011-08-31turn on private memory pool by default.Xiaohong Bao
2011-08-31MergeXiaohong Bao
2011-08-31storm-1578: change default Away timeout to "never"Oz 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-31merge changes for storm-1567Oz Linden
2011-08-31merge changes for storm-638Oz Linden
2011-08-31merge changes for storm-1566Oz Linden
2011-08-31merge changes for storm-1572Oz Linden
2011-08-31merge changes for storm-1574Oz Linden
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-29STORM-1522 Region/Estate -> Terrain Text explaining Low and High values is ↵Jonathan Yap
truncated
2011-08-29mergBrad Payne (Vir Linden)
2011-08-29increment viewer version to 3.0.4Oz Linden