diff options
| author | dolphin@dolphin-THINK.lindenlab.com <dolphin@dolphin-THINK.lindenlab.com> | 2012-11-26 08:42:57 -0800 |
|---|---|---|
| committer | dolphin@dolphin-THINK.lindenlab.com <dolphin@dolphin-THINK.lindenlab.com> | 2012-11-26 08:42:57 -0800 |
| commit | bc8b81b16d083cacd6ab4cf45a60cfec9dfc5a8c (patch) | |
| tree | 64af20bb9cb4d23bd9e4a9d87fb4a43f4a437bd6 /indra/newview/llviewertexture.h | |
| parent | 2566e0d08fd7e8a47fc690a8163c1273d91141c2 (diff) | |
| parent | a830812172d7eb163c06ead3155dc4b43ded4346 (diff) | |
Merge
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 ; |