diff options
author | Cho <cho@lindenlab.com> | 2013-01-14 23:09:01 +0000 |
---|---|---|
committer | Cho <cho@lindenlab.com> | 2013-01-14 23:09:01 +0000 |
commit | cb82e865a02a32f2d4e207974ff9373a99ceec95 (patch) | |
tree | ce19fff3e038e7097b09440f955d1018c97f571a /indra/newview/llviewertexture.h | |
parent | b47a7751990b240198d4e868f5a35bbd1b34e4ee (diff) | |
parent | 23ffb7db1bb065b5afbdcb94eab57720d604ae8d (diff) |
merging latest changes?
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 ; |