summaryrefslogtreecommitdiff
path: root/indra/newview/llviewertexture.cpp
AgeCommit message (Collapse)Author
2009-10-03fix for DEV-40559: viewer crash when media texture appears while parcel ↵Xiaohong Bao
media is loading.
2009-10-01svn merge -r 134922:134973 ↵Monroe Williams
svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7 Merging branches/media-on-a-prim/moap-7 down to viewer-2.0.
2009-09-22Merging render-pipeline-6-qa-2 into viewer-2David Parks
Self reviewed.
2009-09-18merge -r132681 from texture-pipeline-4 to fix a flaw of endlessly fetching ↵Xiaohong Bao
the default texture.
2009-09-09merge -r132032-132812 ↵Richard Nelson
svn+ssh://svn.lindenlab.com/svn/linden/branches/gooey/gooey-1
2009-07-31for DEV-33077 partially: don't call analyzeAlpha for media textures.Xiaohong Bao
2009-07-30merge ↵Steven Bennetts
https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0/indra@1170 https://svn.aws.productengine.com/secondlife/pe/stable-1/indra@1187 -> viewer-2.0.0-3
2009-07-16make LLViewerTextureManager::staticCastToFetchedTexture to accept NULL ↵Xiaohong Bao
pointer as input.
2009-07-10merge QAR-1579: texture-cleanup-1.Xiaohong Bao