Merge branch 'develop' into rlva/base

1 files changed, 3 insertions, 0 deletions

diff --git a/indra/newview/llfloatersettingsdebug.h b/indra/newview/llfloatersettingsdebug.h
index b813cf4a74..8849766867 100644
--- a/indra/newview/llfloatersettingsdebug.h
+++ b/indra/newview/llfloatersettingsdebug.h
@@ -49,6 +49,7 @@ public:
 
     void onCommitSettings();
     void onClickDefault();
+    void onClickCopy();
 
     bool matchesSearchFilter(std::string setting_name);
     bool isSettingHidden(LLControlVariable* control);
@@ -77,7 +78,9 @@ protected:
     LLUICtrl*           mBooleanCombo = nullptr;
     LLUICtrl*           mValText = nullptr;
     LLUICtrl*           mDefaultButton = nullptr;
+    LLTextEditor*       mLLSDVal = nullptr;
     LLTextBox*          mSettingNameText = nullptr;
+    LLButton*           mCopyBtn = nullptr;
 
     LLColorSwatchCtrl* mColorSwatch = nullptr;