diff options
author | Callum Prentice <callum@Callums-MacBook-Pro.local> | 2021-04-01 14:35:28 -0700 |
---|---|---|
committer | Callum Prentice <callum@Callums-MacBook-Pro.local> | 2021-04-01 14:35:28 -0700 |
commit | 930b8ed36e56e08a9449833073dbdd0017bcbaa4 (patch) | |
tree | 829bb63a8e777eef0c622c085671aebe8ae351c1 /indra/newview/lltexturectrl.cpp | |
parent | 45af049a479928208a1ad30a90c1db6be1969f9a (diff) | |
parent | 167e45e309ebeaccb346b8ca05884b8e10bf05eb (diff) |
Merge with ti of master after Viewer release
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"; |