Merge branch 'main' into release/luau-scripting for Maint X release.

1 files changed, 31 insertions, 10 deletions

diff --git a/indra/llui/lltimectrl.cpp b/indra/llui/lltimectrl.cpp
index ca9c05bb6a..3d404293c6 100644
--- a/indra/llui/lltimectrl.cpp
+++ b/indra/llui/lltimectrl.cpp
@@ -49,6 +49,36 @@ const U32 HOURS_MAX = 12;
 const U32 MINUTES_PER_HOUR = 60;
 const U32 MINUTES_PER_DAY = 24 * MINUTES_PER_HOUR;
 
+class LLTimeValidatorImpl : public LLTextValidate::ValidatorImpl
+{
+public:
+    // virtual
+    bool validate(const std::string& str) override
+    {
+        std::string hours = LLTimeCtrl::getHoursString(str);
+        if (!LLTimeCtrl::isHoursStringValid(hours))
+            return setError("ValidatorInvalidHours", LLSD().with("STR", hours));
+
+        std::string minutes = LLTimeCtrl::getMinutesString(str);
+        if (!LLTimeCtrl::isMinutesStringValid(minutes))
+            return setError("ValidatorInvalidMinutes", LLSD().with("STR", minutes));
+
+        std::string ampm = LLTimeCtrl::getAMPMString(str);
+        if (!LLTimeCtrl::isPMAMStringValid(ampm))
+            return setError("ValidatorInvalidAMPM", LLSD().with("STR", ampm));
+
+        return resetError();
+    }
+
+    // virtual
+    bool validate(const LLWString& wstr) override
+    {
+        std::string str = wstring_to_utf8str(wstr);
+
+        return validate(str);
+    }
+} validateTimeImpl;
+LLTextValidate::Validator validateTime(validateTimeImpl);
 
 LLTimeCtrl::Params::Params()
 :   label_width("label_width"),
@@ -111,7 +141,7 @@ LLTimeCtrl::LLTimeCtrl(const LLTimeCtrl::Params& p)
     params.keystroke_callback(boost::bind(&LLTimeCtrl::onTextEntry, this, _1));
     mEditor = LLUICtrlFactory::create<LLLineEditor> (params);
     mEditor->setPrevalidateInput(LLTextValidate::validateNonNegativeS32NoSpace);
-    mEditor->setPrevalidate(boost::bind(&LLTimeCtrl::isTimeStringValid, this, _1));
+    mEditor->setPrevalidate(validateTime);
     mEditor->setText(LLStringExplicit("12:00 AM"));
     addChild(mEditor);
 
@@ -247,15 +277,6 @@ void LLTimeCtrl::onTextEntry(LLLineEditor* line_editor)
     mTime = h24 * MINUTES_PER_HOUR + m;
 }
 
-bool LLTimeCtrl::isTimeStringValid(const LLWString &wstr)
-{
-    std::string str = wstring_to_utf8str(wstr);
-
-    return isHoursStringValid(getHoursString(str)) &&
-        isMinutesStringValid(getMinutesString(str)) &&
-        isPMAMStringValid(getAMPMString(str));
-}
-
 void LLTimeCtrl::increaseMinutes()
 {
     mTime = (mTime + mSnapToMin) % MINUTES_PER_DAY - (mTime % mSnapToMin);