Merge branch 'main' into marchcat/x-mf-merge

# Conflicts:
#	doc/contributions.txt
#	indra/newview/llfloaterimagepreview.cpp

1 files changed, 12 insertions, 14 deletions

diff --git a/indra/llui/lltimectrl.h b/indra/llui/lltimectrl.h
index ff46bc76ca..a2c016ab6f 100644
--- a/indra/llui/lltimectrl.h
+++ b/indra/llui/lltimectrl.h
@@ -60,6 +60,18 @@ public:
 
     void setTime24(F32 time);   // 0.0 - 23.98(3)
 
+    static std::string getHoursString(const std::string& str);
+    static std::string getMinutesString(const std::string& str);
+    static std::string getAMPMString(const std::string& str);
+
+    static bool isHoursStringValid(const std::string& str);
+    static bool isMinutesStringValid(const std::string& str);
+    static bool isPMAMStringValid(const std::string& str);
+
+    static U32  parseHours(const std::string& str);
+    static U32  parseMinutes(const std::string& str);
+    static bool parseAMPM(const std::string& str);
+
 protected:
     LLTimeCtrl(const Params&);
     friend class LLUICtrlFactory;
@@ -87,8 +99,6 @@ private:
     void    onDownBtn();
     void    onTextEntry(LLLineEditor* line_editor);
 
-    bool    isTimeStringValid(const LLWString& wstr);
-
     void increaseMinutes();
     void increaseHours();
 
@@ -102,18 +112,6 @@ private:
 
     EEditingPart getEditingPart();
 
-    static std::string getHoursString(const std::string& str);
-    static std::string getMinutesString(const std::string& str);
-    static std::string getAMPMString(const std::string& str);
-
-    static bool isHoursStringValid(const std::string& str);
-    static bool isMinutesStringValid(const std::string& str);
-    static bool isPMAMStringValid(const std::string& str);
-
-    static U32      parseHours(const std::string& str);
-    static U32      parseMinutes(const std::string& str);
-    static bool     parseAMPM(const std::string& str);
-
     class LLTextBox*    mLabelBox;
 
     class LLLineEditor* mEditor;