diff options
| author | Callum Prentice <callum@Callums-MacBook-Pro.local> | 2021-04-01 17:14:24 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@Callums-MacBook-Pro.local> | 2021-04-01 17:14:24 -0700 |
| commit | 645cf6a5d26b21cd873238c2ac8417d0b1abd37a (patch) | |
| tree | 2690e7dc8a233bd000f4ffd288aafcb1007006ea /indra/newview/lltexturectrl.cpp | |
| parent | 9f95e619c9802bd405db43afa3fbf6b5ad82799d (diff) | |
| parent | 167e45e309ebeaccb346b8ca05884b8e10bf05eb (diff) | |
Merge branch 'master' into DRTVWR-519
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"; |