diff options
author | Euclid Linden <euclid@lindenlab.com> | 2021-04-01 21:14:16 +0000 |
---|---|---|
committer | Euclid Linden <euclid@lindenlab.com> | 2021-04-01 21:14:16 +0000 |
commit | 2130b6b144b64c223a656206f0d3e9babfd9a863 (patch) | |
tree | 8f47ce24e0d455c0478e6266d8a7c3874883e055 /indra/newview/lltexturectrl.cpp | |
parent | d357bf7ae5c5e0b6e66e7d82ce1677360b4cb990 (diff) | |
parent | 3cad30d9ee6a0cd2a68ed213e7383fa11df9d9f5 (diff) |
Merged in DV525-merge-6.4.18 (pull request #511)
DRTVWR-525 merge up to 6.4.18
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"; |