summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatermodelpreview.cpp
AgeCommit message (Collapse)Author
2011-09-08Merge from viewer-experienceLeslie Linden
2011-08-31MergeXiaohong Bao
2011-08-12merge from viewer-experienceLeyla Farazha
2011-07-15Merge from viewer-developmentXiaohong Bao
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)
2011-07-10mergeDave Parks
2011-07-09Added L$ price breakdown for model uploadsDon Kjer
2011-07-09mergeDave Parks
2011-07-09SH-2007 Code cleanup, expand minimum header size to 4KB, better comments ↵Dave Parks
around magic numbers, remove dead calcResourceCost
2011-07-09Fix for SH-2028. Also fixed layout issues with new upload warning and ↵Don Kjer
upload price text when floater is resized.
2011-07-07mergeDave Parks
2011-07-07SH-1774 Remove misleading "Debug" comment -- this code performs a function.Dave Parks
2011-07-07SH-1774 Fix for preserving material assignments between multiple custom LoDs.Dave Parks
2011-07-07Fix for SH-1992prep
2011-07-07Fixes for SH-1994 and SH-2009prep
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-07-06mergeBrad Payne (Vir Linden)
2011-07-06SH-1988 Fix for using diameter instead of radius for streaming cost.Dave Parks
2011-07-05mergeBrad Payne (Vir Linden)
2011-07-03SH-1747 mesh-asset-dep -- uploaded objects have bad permissions, and SH-1975 ↵Don Kjer
Name of mesh is not loaded into mesh uploader floater. Also removed a lot of dead mesh uploader code.
2011-07-01Automated merge with https://bitbucket.org/seth_productengine/mesh-developmentNyx (Neal Orman)
2011-07-01SH-1725 SH-1726 FIX mesh upload wizard & advanced don't handle upload errors ↵Nyx (Neal Orman)
gracefully Restructured the code to be a bit cleaner, now have callbacks with appropriate functionality in both the wizard and advanced uploaders. If the upload fails, it requires the user to re-submit the recalculate request.
2011-07-01mergeBrad Payne (Vir Linden)
2011-06-30Automated merge with https://bitbucket.org/seth_productengine/mesh-developmentNyx (Neal Orman)
2011-06-30SH-1332 Remaining mesh wizard upload workNyx (Neal Orman)
adding observer classes for the upload step so we don't move to success state until upload succeeds.
2011-06-30- SH-1726 ADDITIONAL FIX (Viewer modifications to advanced model upload to ↵Paul ProductEngine
accommodate upload fee & prim equivalency) added the link for "Find out how" in warning text of advanced upload floater advanced upload, button returns to "get fees" whenever any option that affects price changes
2011-06-30SH-1726 ADDITIONAL FIX (Viewer modifications to advanced model upload to ↵Paul ProductEngine
accomodate upload fee & prim equivilancy) - Added a signal on model change to initiate recalculating (calculate phys&fee button is shown again) - Show 'calculate phys&fee' button on fee request error
2011-06-29SH-1726 WIP - prevent upload until sucessful fee requestBrad Payne (Vir Linden)
2011-06-29SH-1725 WIP Added upload permissions and fee requests to Upload Model Wizard.Seth ProductEngine
- Enabled warning for users without upload permissions. - Enabled "Calculate weights & fee" button. - Temporarily enabled to upload meshes if upload permission capability request has failed.
2011-06-29Fixes for upload permission checking problemsBrad Payne (Vir Linden)
2011-06-29SH-1726 FIXED (Viewer modifications to advanced model upload to accommodate ↵Paul ProductEngine
upload fee & prim equivalency) - Changed XUI according to the spec - Added requesting upload permission, physics weight and fee weight - Split requesting fee and uploading model steps in mesh repository
2011-06-28mergePaul ProductEngine
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-28SH-1725 WIP Fixed model preview panels cursor change.Seth ProductEngine
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
2011-06-22SH-989 FIX - only reject LOD if vertex total is too high, rather than ↵Brad Payne (Vir Linden)
checking mesh-by-mesh. This should make rejections much less common.
2011-06-22SH-1725 WIP Floater upload model wizard update:Seth ProductEngine
- XUI changed according to latest mockups - Added switching to advanced upload floater - Added "Recalculate geometry" and "Recalculate physics" buttons
2011-06-18mergeDave Parks
2011-06-18SH-828 Fix for using uninitialized data when normals or texture coordinates ↵Dave Parks
are absent from collada file (can now upload meshes without normals or texture coordinates).
2011-06-17fix for SH-1783: [PUBLIC] Crash when adding a physics shape.Xiaohong Bao
2011-06-15Automated merge with http://hg.secondlife.com/mesh-developmentXiaohong Bao
2011-06-15fix for SH-1788: Assert in texture load when uploading textured mesh modelXiaohong Bao
and beyond: fixed the thread-safe and highest texture resolution flaws in the mesh texture uploading flow.
2011-06-15Fix for sh-1771 and also fixed a bug with a never ending load (with eventual ↵prep linden
crash) bug when a visual scene is missing.