summaryrefslogtreecommitdiff
path: root/indra/newview/llmeshrepository.cpp
AgeCommit message (Expand)Author
2013-01-31Fix funky merge problemsimon@Simon-PC.lindenlab.com
2013-01-30merge downstream code from viewer-lionsimon@Simon-PC.lindenlab.com
2012-11-20Automated merge with https://bitbucket.org/lindenlab/viewer-developmentDave Parks
2012-11-09MAINT-1311 Thread safe handling of retries on mesh loading failures.Dave Parks
2012-11-08MAINT-1311 Followup on logging and assertions of mesh loading errorsDave Parks
2012-10-26MAINT-1311 Add some logging and assertions to help track down mesh loading er...Dave Parks
2012-10-17MAINT-873 Fix for inability to upload meshes on some systems.Dave Parks
2012-10-17MAINT-873 Fix for inability to upload meshes on some systems.Dave Parks
2012-06-01check mesh repo thread before actively using it.Nicky
2012-08-14Make sure only one thread access mPendingLOD at a time.Nicky
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
2012-02-17SH-2941 Fix for crash on shutdown due to race condition between LLCurl and LL...Dave Parks
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
2012-01-24SH-2791 Use request class constructor/destructor for keeping track of concurr...Dave Parks
2012-01-24SH-2791 Use request class constructor/destructor for keeping track of concurr...Dave Parks
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 cr...Xiaohong Bao
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 an...Dave Parks
2011-08-16FIX SH-859, SH-1274 - added fix for determining triangle count andNyx (Neal Orman)
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 ex...prep linden
2011-08-04SH-2201 Fix for crash when getting mesh estimates.Dave Parks
2011-08-02SH-2202 FIX physics costs have increasedNyx (Neal Orman)
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 does...seth_productengine
2011-07-22SH-1868 WIP Added user-supplied metric data for uploading a model.seth_productengine
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