diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2020-09-23 20:20:27 +0100 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2020-09-23 20:20:27 +0100 |
| commit | 1cba874abf6f955cf52d68c30c3230ec58528057 (patch) | |
| tree | aab7c3a11e440fdb8c1e70f2c625e6f6034cf2c2 /indra/newview/lltexturectrl.h | |
| parent | 1049f15c9cbb3d9fdd3f1f8529b7ca46c5f2b7f3 (diff) | |
| parent | 60ed688026269568a9eef67437dc780f88c92871 (diff) | |
Merge remote-tracking branch 'origin/master' into DRTVWR-517
Diffstat (limited to 'indra/newview/lltexturectrl.h')
| -rw-r--r-- | indra/newview/lltexturectrl.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/lltexturectrl.h b/indra/newview/lltexturectrl.h index b2a34a37c4..c705c34e21 100644 --- a/indra/newview/lltexturectrl.h +++ b/indra/newview/lltexturectrl.h @@ -36,7 +36,6 @@ #include "llstring.h" #include "lluictrl.h" #include "llpermissionsflags.h" -#include "llradiogroup.h" #include "lltextbox.h" // for params #include "llviewerinventory.h" #include "llviewborder.h" // for params @@ -44,7 +43,7 @@ #include "llviewertexture.h" #include "llwindow.h" -class LLButton; +class LLComboBox; class LLFloaterTexturePicker; class LLInventoryItem; class LLViewerFetchedTexture; @@ -367,7 +366,7 @@ protected: LLSaveFolderState mSavedFolderState; BOOL mSelectedItemPinned; - LLRadioGroup* mModeSelector; + LLComboBox* mModeSelector; LLScrollListCtrl* mLocalScrollCtrl; private: |