diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-04-01 20:45:16 +0300 |
---|---|---|
committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-04-01 20:45:16 +0300 |
commit | 9fe758e8bc747ff4fe7d4c5dcd1d7914aaa53195 (patch) | |
tree | e25c765db5efeb8ef482ca2706637c25f23672ec /indra/newview/lltexturectrl.cpp | |
parent | b6883636ffe7b14f3adba325591222e6a4940772 (diff) | |
parent | 167e45e309ebeaccb346b8ca05884b8e10bf05eb (diff) |
Merge branch 'master' into DRTVWR-516-maint
Diffstat (limited to 'indra/newview/lltexturectrl.cpp')
-rw-r--r-- | indra/newview/lltexturectrl.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp index 6ccb2f68e5..1c4a56b549 100644 --- a/indra/newview/lltexturectrl.cpp +++ b/indra/newview/lltexturectrl.cpp @@ -73,6 +73,7 @@ #include "llavatarappearancedefines.h" + static const S32 LOCAL_TRACKING_ID_COLUMN = 1; //static const char CURRENT_IMAGE_NAME[] = "Current Texture"; |