summaryrefslogtreecommitdiff
path: root/indra/newview/llmeshrepository.cpp
AgeCommit message (Collapse)Author
2012-06-27Merge pulled in lindenlab/viewer-beta to kelly_linden/maint-1078Kelly Washington
2012-06-22mergeDave Parks
2012-06-21merge changes for DRTVWR-168Oz Linden
2012-05-20Merged with viewer-betaKitty Barnett
2012-05-08merge changes for version 3.3.1Oz Linden
2012-04-09MAINT-890 Fix for freeze on exit when a mesh upload is pending.Dave Parks
2012-03-26mergeDave Parks
2012-04-13MAINT-871 Fix for freeze on shutdown while calculating weights and fees of a ↵Dave Parks
mesh.
2012-02-17SH-2941 Fix for crash on shutdown due to race condition between LLCurl and ↵Dave Parks
LLMeshRepository
2012-02-24Merge with viewer-developmentKitty Barnett
2012-03-09mergeDave Parks
2012-02-06merge, conflicts in llvertexbuffer.{h,cpp}Brad Payne (Vir Linden)
2012-02-01mergeBrad Payne (Vir Linden)
2012-01-31Fixed up LLVolume memory leak caused by mesh repo thread.Leslie Linden
Reviewed by Bao.
2012-01-24SH-2791 Use request class constructor/destructor for keeping track of ↵Dave Parks
concurrent requests instead of unreliable increments/decrements sprinkled around the code.
2012-01-24SH-2791 Use request class constructor/destructor for keeping track of ↵Dave Parks
concurrent requests instead of unreliable increments/decrements sprinkled around the code.
2012-01-19SH-2885 Add mesh requests pending/processing line to "Show Render Info"Dave Parks
2012-01-12fix for SH-2845, SH-2846, SH-2847, SH-2851: curl crashes and out-of-memory ↵Xiaohong Bao
crashes.
2011-10-14b782a75c99e6 backout cleanupDave Parks
2011-09-14mergeBrad Payne (Vir Linden)
2011-09-08Merge from viewer-experienceLeslie Linden
2011-09-06mergeBrad Payne (Vir Linden)
2011-09-01Fix for model metricsBrad Payne (Vir Linden)
2011-08-31MergeXiaohong Bao
2011-08-18merging in latest mesh-developmentNyx (Neal Orman)
2011-08-17SH-2188 Fix for generally bad vertex buffer updates for rigged attachments ↵Dave Parks
and fix for viewer always thinking meshes initially have 8 texture entries.
2011-08-16FIX SH-859, SH-1274 - added fix for determining triangle count andNyx (Neal Orman)
performance tested impact of animated textures Also did some cleanup to ensure branch built and ran properly after last merge.
2011-08-12merge from viewer-experienceLeyla Farazha
2011-08-10merge viewer-development to mesh-developmentBrad Payne (Vir Linden)
2011-08-10Submitted correction for logic error: if decomp fails for single hull only ↵prep linden
execute fallback code
2011-08-04SH-2201 Fix for crash when getting mesh estimates.Dave Parks
2011-08-02SH-2202 FIX physics costs have increasedNyx (Neal Orman)
Changed the default to use low LOD for single hull generation, will fall back to medium or high if not present.
2011-08-02fix for SH-2144: [PUBLIC] Hi-resolution model that don't upload.Xiaohong Bao
2011-07-25SH-1941 FIXED Mesh upload menu enabled when avatar is in the region that ↵seth_productengine
does not allow building but supports mesh upload.
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-27 04:18:42 +0000