summaryrefslogtreecommitdiff
path: root/indra/newview/llviewertexture.cpp
AgeCommit message (Collapse)Author
2015-04-13merge changes for 3.7.27-releaseOz Linden
2015-01-07MAINT-4773 FIXED Some transparent textures are rendered as white.ruslantproductengine
This bug fix related also to MAINT-4092. In 4092 sometimes when we don't have information about the texture during the setup the materail (LLVOVolume::setTEMaterialParams()), we should substitute the material with disabled "diffuse alpha mode" (for detail in cases see MAINT-4092 JIRA ticket comment). This bug fix cover the case when after the loading texture we have all information about alpha mode, and in this case we should restore diffuse alpha mode if need. In short: now we always believe that information about the material is valid (LLVOVolume::setTEMaterialParams()). Of course before setup it we check information about texture (if it possible) , if texture is not exist in database or not 32 bit depth (for diffuse) we made changes. But in all other cases (if we can't receive information about texture) we remeber this case in mWaitingTextureInfo multimap. When information about texture will be available we get it in: LLVOVolume::notify AboutCreatingTexture() or Volume::notifyAboutMissingAsset() and again, we recheck it and if need change (substitute) the material parameters. I suppose that this solution is better than was before. If this patch will be accepted , I think that MAINT-4092 should be rechecked again.
2014-10-20Update to build on Xcode 6.0: Large (and final) collection of fixes for ↵callum_linden
unused variables, unused const-variables, unused member variables & functions etc. Also removed flags from CMake
2014-08-22MAINT-4288 FIXED Backed out changeset for MAINT-4018 (c92d43623c2c)maksymsproductengine
2014-07-07Merge downstream code and become 3.7.12simon
2014-07-07MAINT-2980 Back out most changes related to upping the 512MB texture cap to ↵Dave Parks
unblock RC.
2014-06-24Pull downstream viewer-tiger and become version 3.7.11simon
2014-06-23MAINT-2980 Up texture memory slider cap to 4096MB. Make "Texture Memory" ↵Dave Parks
default to 1/3rd of video memory. Add description on debug setting and tooltip to explain why.
2014-06-18Merge downstream codesimon
2014-05-23MAINT-4018 FIXED Mini profile pictures tend to fail to load fully, and ↵andreykproductengine
sometimes not at all. Profile icons are no longer discarded uless they are too big. Icons will refresh correctly if needed.
2014-05-20MAINT-3950 FIXED can't open lag meterRichard Linden
brought back llfloaterlagmeter from the dead, and ported to lltrace
2014-05-14v-r -> s-e merge WIPBrad Payne (Vir Linden)
2014-05-13sunshine-external merge WIPBrad Payne (Vir Linden)
2014-03-12mergeBrad Payne (Vir Linden)
2014-03-12merge with releaseRichard Linden
2013-12-05mergeBrad Payne (Vir Linden)
2013-11-11Automated merge with http://bitbucket.org/lindenlab/viewer-releaseRichard Linden
2013-11-07add some debug code for possible gray baked avatar texturesXiaohong Bao
2013-10-28a try to fix the blurry texture problem.Xiaohong Bao
2013-10-15renamed TimeBlock to BlockTimerStatHandleRichard Linden
2013-10-15mergeBrad Payne (Vir Linden)
2013-10-11SH-4458 SH-3652 FIX Pants flare does not load properly upon an avatar returningNyx Linden
Viewer added a new callback when the avatar returned without resetting the timer for last reference to the saved raw image. This created a time window in which new callbacks could get cleared out due to the raw image getting destroyed. Since the callback was removed, pants flare was not properly applied. Appears to be working now.
2013-10-08fix a texture issue that unpaused callbacks never get fired.Xiaohong Bao
2013-09-24mergeBrad Payne (Vir Linden)
2013-09-23fix the bug that texture aux channel data can not be reloaded.Xiaohong Bao
2013-09-23SH-3455 WIP - post-SSA cleanupBrad Payne (Vir Linden)
2013-09-18sunshine cleanup annotationsBrad Payne (Vir Linden)
2013-09-05changed fast timer over to using macroRichard Linden
another attempt to move mem stat into base class
2013-08-22mergeBrad Payne (Vir Linden)
2013-08-19Automated merge with http://bitbucket.org/lindenlab/viewer-interestingXiaohong Bao
2013-08-19MergeXiaohong Bao
2013-08-18SH-4433 WIP: Interesting: Statistics > Ping Sim is always 0 msRichard Linden
continued conversion to units system made units perform type promotion correctly and preserve type in arithmetic e.g. can now do LLVector3 in units added typedefs for remaining common unit types, including implicits
2013-08-16merge with viewer-releaseNyx Linden
2013-08-15moved unit types out of LLUnits namespace, since they are prefixedRichard Linden
2013-08-14BUILDFIX: added header for numeric_limits support on gccRichard Linden
added convenience types for units F32Seconds, etc.
2013-10-04MAINT-3270 FIXED crash in LLControlCache<unsigned int>::LLControlCache: ↵maksymsproductengine
Control named RenderAutoMuteFunctionsnot found
2013-10-21Fix for crash on exit with debug GL enabled.Dave Parks
2013-08-09second phase summer cleaningRichard Linden
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-07-30Summer cleaning - removed a lot of llcommon dependencies to speed up build timesRichard Linden
consolidated most indra-specific constants in llcommon under indra_constants.h fixed issues with operations on mixed unit types (implicit and explicit) made LL_INFOS() style macros variadic in order to subsume other logging methods such as ll_infos added optional tag output to error recorders
2013-06-20merge with releaseRichard Linden
2013-06-20Automated merge with http://bitbucket.org/lindenlab/viewer-releaseDave Parks
2013-06-13SH-3931 WIP Interesting: Add graphs to visualize scene load metricsRichard Linden
changed Units macros and argument order to make it more clear optimized units for integer types fixed merging of periodicrecordings...should eliminate duplicate entries in sceneloadmonitor history
2013-06-13SH-4250 WIP - logging tweaks and cleanupBrad Payne (Vir Linden)
2013-06-05merge with viewer-releaseRichard Linden
2013-06-04SH-3931 WIP Interesting: Add graphs to visualize scene load metricsRichard Linden
fixed mem stat tracking...now properly tracks memory footprint with floating point precision cleaned up macros for unit declaration renamed units to SI standard for 1024 multiples (kibibytes, etc) fixed units output for scene monitor dump
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