diff options
| author | Dave Parks <davep@lindenlab.com> | 2012-11-07 16:14:31 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2012-11-07 16:14:31 -0600 |
| commit | adacf00aadaf9097c2293b6c6b9203b5f4f0c780 (patch) | |
| tree | 6022511fe314c3ffaa794fef99b213b592ecae96 /indra/newview/llviewertexture.h | |
| parent | 42b9001e97298594f79b2145ac13df925d532a6d (diff) | |
| parent | a36b66bd145e99a8f597f1c7c3b48ca30bdd7029 (diff) | |
Automated merge with http://bitbucket.org/lindenlab/viewer-beta
Diffstat (limited to 'indra/newview/llviewertexture.h')
| -rwxr-xr-x | indra/newview/llviewertexture.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llviewertexture.h b/indra/newview/llviewertexture.h index 2ea9a07e9a..2e7949e9a3 100755 --- a/indra/newview/llviewertexture.h +++ b/indra/newview/llviewertexture.h @@ -275,6 +275,7 @@ private: protected: LLUUID mID; S32 mBoostLevel; // enum describing priority level + F32 mSelectedTime; // time texture was last selected S32 mFullWidth; S32 mFullHeight; BOOL mUseMipMaps ; |