summaryrefslogtreecommitdiff
path: root/indra/newview/llviewertexture.cpp
AgeCommit message (Collapse)Author
2013-06-20Automated merge with http://bitbucket.org/lindenlab/viewer-releaseDave Parks
2013-05-10Fixup merge diffsGraham Madarasz
2013-05-09Merge downstream code / viewer-betasimon
2013-05-09Merge viewer-betasimon
2013-05-01Merge vwr-dev-matGraham Madarasz
2013-04-30Merge 3.5.1 into MaterialsGraham Madarasz
2013-04-26Restore hysteresis in llviewertexture.cpp and side-step unused var (now used ↵Graham Madarasz
again)
2013-04-25Merge 3.5.1 into MaterialsGraham Madarasz
2013-04-19merge changes for DRTVWR-294Oz Linden
2013-04-11Forgot to commit @#! mergesimon
2013-04-11Mergesimon
2013-04-11First pass on alpha blended materialsGeenz
2013-04-02SH-4057 FIX - host bake textures should start with UDP fetching now, instead ↵Brad Payne (Vir Linden)
of waiting to fail down
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2013-03-25NORSPEC-54 Potential fix for crashing on all sorts of random operations.Dave Parks
2013-03-18mergeprep
2013-03-18more urgent notification (DEBUG->WARN) for some texture fetch error casesBrad Payne (Vir Linden)
2013-03-18cut back log spamBrad Payne (Vir Linden)
2013-03-15SH-3850 WIP, SH-3959 WIP - added additional debug logging for texture loadingBrad Payne (Vir Linden)
2013-03-11mergeprep
2013-03-08SH-3959 WIP - pass information about type of fetched image - server bake, ↵Brad Payne (Vir Linden)
host bake, map tile, etc - down the chain so LLTextureFetchWorker can adjust behavior as needed
2013-02-14tweaked and added some log messages, including more detail when an image is ↵Brad Payne (Vir Linden)
flagged as missing
2013-02-14MAINT-2368 Pull in Firestorm fix for textures unloading behind you.Dave Parks
2013-01-24merging in viewer-beta.Nyx Linden
Most of the merge was clean, a couple conflicts. Brought over a couple patches manually for llpolymesh.
2013-01-11SH-3639 WIP - cleaned up some diagnostics and added fault injection ability. ↵Brad Payne (Vir Linden)
Disabled inventory retries for now.
2013-01-11mergeBrad Payne (Vir Linden)
2013-01-07SH-3344 WIP - keep avatar local textures flagged no-delete while in useBrad Payne (Vir Linden)
2013-01-03fix for MAINT-2147: crash in LLTextureCache::writeToFastCache on OSXXiaohong Bao
2012-12-20fix for SH-3151: Some textures not in view load when avatar sits down.Xiaohong Bao
2012-12-20SH-3344 WIP - additional debugging output for avatar local texturesBrad Payne (Vir Linden)
2012-12-04Pull and merge viewer-developmentsimon@Simon-PC.lindenlab.com
2012-11-28SH-3563. Pull and merge from viewer-development. Modest code changes to fix ↵prep
alignment issue in llAppearance.
2012-11-20Automated merge with https://bitbucket.org/lindenlab/viewer-developmentDave Parks
2012-11-20merge changes for DRTVWR-246Oz Linden
2012-11-07Automated merge with http://bitbucket.org/lindenlab/viewer-betaDave Parks
2012-11-07MAINT-1815 Fix for excessive memory usage in Mayfair. Disable tcmalloc. ↵Dave Parks
Disable private memory pools. Make viewer large address aware on windows. Reviewed by Kelly
2012-11-01misc error detection, debug coloration for avatar meshesBrad Payne (Vir Linden)
2012-09-05Merge in latest viewer-developmentsimon@Simon-PC.lindenlab.com
2012-09-04Split gl-specific LLViewerTexture implementation into llrender/LLGLViewerTextureDon Kjer
2012-09-03Extracted texture baking system into llappearance library.Don Kjer
2012-08-15merge changes for DRTVWR-194Oz Linden
2012-08-08mergeBrad Payne (Vir Linden)
2012-07-30mergeBrad Payne (Vir Linden)
2012-07-12fix for SH-3237: cached sculpties do not load at the correct LOD.Xiaohong Bao
2012-07-06fix for MAINT-1201: 404 errors appear in the log when opening the world mapXiaohong Bao
2012-07-20MAINT-570 Remove unused memory tracking system LLMemTypeDave Parks
2012-06-28MergeDave Parks
2012-06-26fix merge conflicts: v-r to dranoXiaohong Bao
2012-06-26v-r to drano merge conflicts wipBrad Payne (Vir Linden)
2012-06-22mergeDave Parks
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 23:15:55 +0000