FIRE-18130: Setting llSetTextureAnim to FALSE while enabling llSetPrimMediaParams causes the animation to clear improperly

Sat, 07 Apr 2018 03:34:18 +0200

author
Ansariel
date
Sat, 07 Apr 2018 03:34:18 +0200
changeset 55033
836021469d04
parent 55032
a7bccfa8623c
child 55034
914def879c16

FIRE-18130: Setting llSetTextureAnim to FALSE while enabling llSetPrimMediaParams causes the animation to clear improperly

indra/newview/llmediactrl.cpp file | annotate | diff | revisions
indra/newview/llvovolume.cpp file | annotate | diff | revisions
     1.1 --- a/indra/newview/llmediactrl.cpp	Fri Apr 06 16:24:54 2018 -0700
     1.2 +++ b/indra/newview/llmediactrl.cpp	Sat Apr 07 03:34:18 2018 +0200
     1.3 @@ -827,21 +827,6 @@
     1.4  			S32 x_offset, y_offset, width, height;
     1.5  			calcOffsetsAndSize(&x_offset, &y_offset, &width, &height);
     1.6  
     1.7 -#if 0
     1.8 -			// <FS:ND> Flip Y-Axis of media texture
     1.9 -			U32 mode = gGL.getMatrixMode();
    1.10 -			gGL.matrixMode(LLRender::MM_TEXTURE0);
    1.11 -
    1.12 -			F32 aMatrix[16] = {	1.0f,  0.0f, 0.0f, 0.0f,
    1.13 -								0.0f, -1.0f, 0.0f, 0.0f,
    1.14 -								0.0f,  0.0f, 1.0f, 0.0f,
    1.15 -								0.0f,  max_v, 0.0f, 1.0f
    1.16 -								};
    1.17 -			gGL.pushMatrix();
    1.18 -			gGL.loadMatrix( aMatrix );
    1.19 -			gGL.matrixMode(mode);
    1.20 -			// </FS:ND>
    1.21 -#endif
    1.22  			// draw the browser
    1.23  			// <FS:Ansariel> Remove QUADS rendering mode
    1.24  			//gGL.begin( LLRender::QUADS );
    1.25 @@ -894,13 +879,6 @@
    1.26  				gGL.vertex2i( x_offset + width, y_offset );
    1.27  			}
    1.28  			gGL.end();
    1.29 -#if 0
    1.30 -			// <FS:ND> Restore matrix for texture 0
    1.31 -			gGL.matrixMode(LLRender::MM_TEXTURE0);
    1.32 -			gGL.popMatrix();
    1.33 -			gGL.matrixMode( mode );
    1.34 -			// </FS:ND>
    1.35 -#endif
    1.36  		}
    1.37  		gGL.popUIMatrix();
    1.38  	
     2.1 --- a/indra/newview/llvovolume.cpp	Fri Apr 06 16:24:54 2018 -0700
     2.2 +++ b/indra/newview/llvovolume.cpp	Sat Apr 07 03:34:18 2018 +0200
     2.3 @@ -4569,11 +4569,6 @@
     2.4  	{ //texture animation breaks batches
     2.5  		return false;
     2.6  	}
     2.7 -	
     2.8 -	if( facep->mTextureMatrix &&
     2.9 -		( ( facep->getTextureEntry() && facep->getTextureEntry()->hasMedia() ) ||
    2.10 -		  ( facep->getTexture() && facep->getTexture()->getType()  == LLViewerTexture::MEDIA_TEXTURE ) ) )
    2.11 -		return false;
    2.12  
    2.13  	return true;
    2.14  }
    2.15 @@ -4687,13 +4682,6 @@
    2.16  		tex_mat = facep->mTextureMatrix;	
    2.17  	}
    2.18  
    2.19 -	// <FS:ND> CEF: if this is a face with media, then use the texture matrix to flip the texture
    2.20 -	if( facep->mTextureMatrix &&
    2.21 -		( ( facep->getTextureEntry() && facep->getTextureEntry()->hasMedia() ) ||
    2.22 -		  ( facep->getTexture() && facep->getTexture()->getType()  == LLViewerTexture::MEDIA_TEXTURE ) ) )
    2.23 -		tex_mat = facep->mTextureMatrix;
    2.24 -	// </FS:ND>
    2.25 -	
    2.26  	const LLMatrix4* model_mat = NULL;
    2.27  
    2.28  	LLDrawable* drawable = facep->getDrawable();

mercurial