summaryrefslogtreecommitdiff
path: root/indra/newview/llviewertexture.h
AgeCommit message (Collapse)Author
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-06-18Merge downstream codesimon
2014-05-20MAINT-3950 FIXED can't open lag meterRichard Linden
brought back llfloaterlagmeter from the dead, and ported to lltrace
2014-05-13sunshine-external merge WIPBrad Payne (Vir Linden)
2013-10-08fix a texture issue that unpaused callbacks never get fired.Xiaohong Bao
2013-09-23fix the bug that texture aux channel data can not be reloaded.Xiaohong Bao
2013-08-22mergeBrad Payne (Vir Linden)
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 cleanup - one file did not merge cleanly.Nyx Linden
2013-08-15moved unit types out of LLUnits namespace, since they are prefixedRichard Linden
2013-08-09second phase summer cleaningRichard Linden
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
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-01Merge vwr-dev-matGraham Madarasz
2013-04-30Merge 3.5.1 into MaterialsGraham Madarasz
2013-04-25Merge 3.5.1 into MaterialsGraham Madarasz
2013-04-22for SH-4133: create a debug tool to show textures in active fetchingXiaohong Bao
2013-04-19merge changes for DRTVWR-294Oz Linden
2013-04-15SH-4061 WIP - moved all retry logic into lltexturefetch, some cleanup. Debug ↵Brad Payne (Vir Linden)
setting now defines a fake failure rate.
2013-04-11Mergesimon
2013-04-11First pass on alpha blended materialsGeenz
2013-04-10SH-4061 WIP - capture http status codes from requests, restrict SB fetch ↵Brad Payne (Vir Linden)
retries to 5xx errors
2013-04-08SH-4061 FIX - texture fetch failures added retry logic and fault injection ↵Brad Payne (Vir Linden)
for testing
2013-04-08SH-4061 WIP - added ability to un-set missing asset, do this in the case of ↵Brad Payne (Vir Linden)
FTT_SERVER_BAKE images. This is needed because 'missing' is not necessarily permanent for such images.
2013-04-05SH-4061 WIP - spelling fix, allow un-set of missing asset flag for texturesBrad Payne (Vir Linden)
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-22merge with viewer-releaseRichard 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-01-30merge downstream code from viewer-lionsimon@Simon-PC.lindenlab.com
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-08MergeXiaohong Bao
2013-01-04Automated merge with http://bitbucket.org/lindenlab/viewer-developmentRichard Linden
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-19for SH-3561: capture the frame buffer contents and compare pixel differences ↵Xiaohong Bao
between frames.
2012-11-08SH-3499 WIP Ensure asset stats output is correctRichard Linden
Finished making LLUnit implicitly convertible to/from scalar integer values cleaned up test code
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-10-17SH-3275 Update viewer metrics system to be more flexibleRichard Linden
put template parameter back in LLUnit units added free function operators for mathematical manipulation of unit values converted texture memory tracking to units
2012-09-05Merge in latest viewer-developmentsimon@Simon-PC.lindenlab.com
2012-09-04Cleanup actions from code review of llappearance with nyxDon Kjer