1 files changed, 24 insertions, 1 deletions
diff --git a/indra/newview/llfloaterpreference.h b/indra/newview/llfloaterpreference.h
index fa9c421a8f..8d3f1ed6b0 100644
--- a/indra/newview/llfloaterpreference.h
+++ b/indra/newview/llfloaterpreference.h
@@ -117,6 +117,7 @@ protected:
     void        onClickClearCache();            // Clear viewer texture cache, file cache on next startup
     void        onClickBrowserClearCache();     // Clear web history and caches as well as viewer caches above
     void        onLanguageChange();
+    void        onTimeFormatChange();
     void        onNotificationsChange(const std::string& OptionName);
     void        onNameTagOpacityChange(const LLSD& newvalue);
 
@@ -218,6 +219,7 @@ private:
     bool mGotPersonalInfo;
     bool mLanguageChanged;
     bool mAvatarDataInitialized;
+    U32 mLastQualityLevel = 0;
     std::string mPriorInstantMessageLogPath;
 
     bool mOriginalHideOnlineStatus;
@@ -234,10 +236,11 @@ private:
     LLButton*       mDeleteTranscriptsBtn = nullptr;
     LLButton*       mEnablePopupBtn = nullptr;
     LLButton*       mDisablePopupBtn = nullptr;
+    LLComboBox*     mTimeFormatCombobox = nullptr;
     std::unique_ptr< ll::prefs::SearchData > mSearchData;
     bool mSearchDataDirty;
 
-    boost::signals2::connection	mImpostorsChangedSignal;
+    boost::signals2::connection mImpostorsChangedSignal;
     boost::signals2::connection mComplexityChangedSignal;
 
     void onUpdateFilterTerm( bool force = false );
@@ -313,6 +316,26 @@ private:
     LOG_CLASS(LLPanelPreferenceGraphics);
 };
 
+class LLPanelPreferenceGraphics3 : public LLPanelPreference
+{
+public:
+    bool postBuild();
+    void draw();
+    void cancel(const std::vector<std::string> settings_to_skip = {});
+    void saveSettings();
+    void resetDirtyChilds();
+    void onMPRecommanded();
+
+protected:
+    bool hasDirtyChilds();
+
+
+private:
+
+
+    LOG_CLASS(LLPanelPreferenceGraphics3);
+};
+
 class LLPanelPreferenceControls : public LLPanelPreference, public LLKeyBindResponderInterface
 {
     LOG_CLASS(LLPanelPreferenceControls);