summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelface.h
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llpanelface.h')
-rw-r--r--indra/newview/llpanelface.h27
1 files changed, 23 insertions, 4 deletions
diff --git a/indra/newview/llpanelface.h b/indra/newview/llpanelface.h
index 602b05d240..5468c369cb 100644
--- a/indra/newview/llpanelface.h
+++ b/indra/newview/llpanelface.h
@@ -52,6 +52,7 @@ class LLFloater;
class LLMaterialID;
class LLMediaCtrl;
class LLMenuButton;
+class LLRadioGroup;
class PBRPickerAgentListener;
class PBRPickerObjectListener;
@@ -147,7 +148,7 @@ protected:
void sendFullbright(); // applies and sends full bright
void sendGlow();
- void alignTestureLayer();
+ void alignTextureLayer();
void updateCopyTexButton();
@@ -291,9 +292,27 @@ private:
F32 getCurrentShinyOffsetU();
F32 getCurrentShinyOffsetV();
- LLComboBox *mComboMatMedia;
- LLMediaCtrl *mTitleMedia;
- LLTextBox *mTitleMediaText;
+ LLTextureCtrl* mPBRTextureCtrl = nullptr;
+ LLTextureCtrl* mTextureCtrl = nullptr;
+ LLTextureCtrl* mShinyTextureCtrl = nullptr;
+ LLTextureCtrl* mBumpyTextureCtrl = nullptr;
+ LLColorSwatchCtrl* mColorSwatch = nullptr;
+ LLColorSwatchCtrl* mShinyColorSwatch = nullptr;
+
+ LLComboBox* mComboTexGen = nullptr;
+
+ LLRadioGroup* mRadioMaterialType = nullptr;
+ LLRadioGroup* mRadioPbrType = nullptr;
+
+ LLCheckBoxCtrl* mCheckFullbright = nullptr;
+
+ LLTextBox* mLabelColorTransp = nullptr;
+ LLSpinCtrl* mCtrlColorTransp = nullptr; // transparency = 1 - alpha
+
+ LLSpinCtrl* mCtrlGlow = nullptr;
+ LLComboBox *mComboMatMedia = nullptr;
+ LLMediaCtrl *mTitleMedia = nullptr;
+ LLTextBox *mTitleMediaText = nullptr;
// Update visibility of controls to match current UI mode
// (e.g. materials vs media editing)