summaryrefslogtreecommitdiff
path: root/indra/newview/llmeshrepository.cpp
AgeCommit message (Collapse)Author
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-18mergeDave Parks
2011-07-18SH-1904 FIX (cherry pick from original by bao)Brad Payne (Vir Linden)
2011-07-18fix for SH-1904: Medallion .dae makes viewer crash during uploadXiaohong Bao
2011-07-15Merge from viewer-developmentXiaohong Bao
2011-07-12MergeDon Kjer
2011-07-12Changes to support SH-1894: Textures uploaded with Mesh do not appear in ↵Don Kjer
inventory. Reviewed by Andrew
2011-07-12Automated merge with http://hg.secondlife.com/mesh-developmentXiaohong Bao
2011-07-12SH-2053 Don't poke the UI from a background thread -- it tends to get crashy.Dave Parks
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-08SH-2007 Don't eat an entire core when uploading meshes or requesting fee ↵Dave Parks
information.
2011-07-07SH-1774 Fix for preserving material assignments between multiple custom LoDs.Dave Parks
2011-07-07fix for SH-1808: uploading warthog model triggers ↵Xiaohong Bao
LLPhysicsDecomp::doDecompositionSingleHull warnings SH-1333: [PUBLIC] Simple mesh causing the viewer to crash
2011-07-07fix for SH-1808: uploading warthog model triggers ↵Xiaohong Bao
LLPhysicsDecomp::doDecompositionSingleHull warnings SH-1333: [PUBLIC] Simple mesh causing the viewer to crash
2011-07-05merge cleanupBrad Payne (Vir Linden)
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-01merge viewer-development -> mesh-developmentBrad Payne (Vir Linden)
2011-07-01mergeBrad Payne (Vir Linden)
2011-06-30SH-680 Update streaming cost to be based on a triangle budget instead of a ↵Dave Parks
magic scaler. Reviewed by Nyx.
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-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-29Merge latest from lindenlab/viewer-developmentDave SIMmONs
2011-06-29SH-1873 FIXED updating L$ balance after uploading meshes.seth_productengine
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-27SH-1899 Check mesh asset version before attempting to parse.Dave Parks
2011-06-27mergeDave Parks
2011-06-27SH-680 Apply a 128-byte discount per LoD block to cover the cost of metadata.Dave Parks
2011-06-24fix for SH-1904: Medallion .dae makes viewer crash during uploadXiaohong Bao
2011-06-23Automated merge with ssh://hg.lindenlab.com/richard/viewer-experienceRichard Linden
2011-06-20fix for SH-1870: can not upload book_collection_1.dae when include texturesXiaohong Bao
2011-06-16Fix for linux build failure, hopefullyBrad Payne (Vir Linden)
2011-06-16mergeBrad Payne (Vir Linden)
2011-06-15SH-1166 WIPBrad Payne (Vir Linden)
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-15SH-1773 FIXBrad Payne (Vir Linden)
2011-06-13SH-1796 FIXBrad Payne (Vir Linden)
2011-06-09mergeDave Parks
2011-06-09SH-1804 Make it damn obvious that there are degenerate triangles in the ↵Dave Parks
physics shape preview render.
2011-06-09Added log spam for mesh upload responsesDon Kjer
2011-06-09Automated merge with https://bitbucket.org/davep/mesh-asset-deprecationXiaohong Bao
2011-06-09partial fix for SH-1804: viewer crashes when uploading "Messerschmitt KR200.dae"Xiaohong Bao
eliminated crashing, but still failed to upload it.
2011-06-09SH-1773 WIPBrad Payne (Vir Linden)
2011-06-09SH-1773 WIPBrad Payne (Vir Linden)
2011-06-08change the color specifier to 'diffuse_color' in theRoxie Linden
mesh upload blobs