Merge main into inventory_favorites

# Conflicts:
#	indra/llui/llfolderviewmodel.h
#	indra/newview/llpanelwearing.cpp
#	indra/newview/llwearableitemslist.cpp

1 files changed, 63 insertions, 65 deletions

diff --git a/indra/llui/lltimectrl.h b/indra/llui/lltimectrl.h
index b5f268c76a..a2c016ab6f 100644
--- a/indra/llui/lltimectrl.h
+++ b/indra/llui/lltimectrl.h
@@ -37,95 +37,93 @@ class LLLineEditor;
 class LLTimeCtrl
 : public LLUICtrl
 {
-	LOG_CLASS(LLTimeCtrl);
+    LOG_CLASS(LLTimeCtrl);
 public:
-	struct Params : public LLInitParam::Block<Params, LLUICtrl::Params>
-	{
-		Optional<S32> label_width;
-		Optional<S32> snap_to;
-		Optional<bool> allow_text_entry;
+    struct Params : public LLInitParam::Block<Params, LLUICtrl::Params>
+    {
+        Optional<S32> label_width;
+        Optional<S32> snap_to;
+        Optional<bool> allow_text_entry;
 
-		Optional<LLUIColor> text_enabled_color;
-		Optional<LLUIColor> text_disabled_color;
+        Optional<LLUIColor> text_enabled_color;
+        Optional<LLUIColor> text_disabled_color;
 
-		Optional<LLButton::Params> up_button;
-		Optional<LLButton::Params> down_button;
+        Optional<LLButton::Params> up_button;
+        Optional<LLButton::Params> down_button;
 
-		Params();
-	};
+        Params();
+    };
 
-	F32 getTime24() const;		// 0.0 - 24.0
-	U32 getHours24() const;		// 0 - 23
-	U32 getMinutes() const;		// 0 - 59
+    F32 getTime24() const;      // 0.0 - 24.0
+    U32 getHours24() const;     // 0 - 23
+    U32 getMinutes() const;     // 0 - 59
 
-	void setTime24(F32 time);	// 0.0 - 23.98(3)
+    void setTime24(F32 time);   // 0.0 - 23.98(3)
 
-protected:
-	LLTimeCtrl(const Params&);
-	friend class LLUICtrlFactory;
-
-private:
+    static std::string getHoursString(const std::string& str);
+    static std::string getMinutesString(const std::string& str);
+    static std::string getAMPMString(const std::string& str);
 
-	enum EDayPeriod
-	{
-		AM,
-		PM
-	};
+    static bool isHoursStringValid(const std::string& str);
+    static bool isMinutesStringValid(const std::string& str);
+    static bool isPMAMStringValid(const std::string& str);
 
-	enum EEditingPart
-	{
-		HOURS,
-		MINUTES,
-		DAYPART,
-		NONE
-	};
+    static U32  parseHours(const std::string& str);
+    static U32  parseMinutes(const std::string& str);
+    static bool parseAMPM(const std::string& str);
 
-	virtual void	onFocusLost();
-	virtual BOOL	handleKeyHere(KEY key, MASK mask);
+protected:
+    LLTimeCtrl(const Params&);
+    friend class LLUICtrlFactory;
 
-	void	onUpBtn();
-	void	onDownBtn();
-	void	onTextEntry(LLLineEditor* line_editor);
+private:
 
-	bool	isTimeStringValid(const LLWString& wstr);
+    enum EDayPeriod
+    {
+        AM,
+        PM
+    };
 
-	void increaseMinutes();
-	void increaseHours();
+    enum EEditingPart
+    {
+        HOURS,
+        MINUTES,
+        DAYPART,
+        NONE
+    };
 
-	void decreaseMinutes();
-	void decreaseHours();
+    virtual void    onFocusLost();
+    virtual BOOL    handleKeyHere(KEY key, MASK mask);
 
-	bool isPM() const;
-	void switchDayPeriod();
+    void    onUpBtn();
+    void    onDownBtn();
+    void    onTextEntry(LLLineEditor* line_editor);
 
-	void updateText();
+    void increaseMinutes();
+    void increaseHours();
 
-	EEditingPart getEditingPart();
+    void decreaseMinutes();
+    void decreaseHours();
 
-	static std::string getHoursString(const std::string& str);
-	static std::string getMinutesString(const std::string& str);
-	static std::string getAMPMString(const std::string& str);
+    bool isPM() const;
+    void switchDayPeriod();
 
-	static bool isHoursStringValid(const std::string& str);
-	static bool isMinutesStringValid(const std::string& str);
-	static bool isPMAMStringValid(const std::string& str);
+    void updateText();
 
-	static U32		parseHours(const std::string& str);
-	static U32		parseMinutes(const std::string& str);
-	static bool		parseAMPM(const std::string& str);
+    EEditingPart getEditingPart();
 
-	class LLTextBox*	mLabelBox;
+    class LLTextBox*    mLabelBox;
 
-	class LLLineEditor*	mEditor;
-	LLUIColor			mTextEnabledColor;
-	LLUIColor			mTextDisabledColor;
+    class LLLineEditor* mEditor;
+    LLUIColor           mTextEnabledColor;
+    LLUIColor           mTextDisabledColor;
 
-	class LLButton*		mUpBtn;
-	class LLButton*		mDownBtn;
+    class LLButton*     mUpBtn;
+    class LLButton*     mDownBtn;
 
-	U32				mTime;				// minutes since midnight: 0 - 1439
-	U32				mSnapToMin;			// interval in minutes to snap to
+    U32             mTime;              // minutes since midnight: 0 - 1439
+    U32             mSnapToMin;         // interval in minutes to snap to
 
-	BOOL			mAllowEdit;
+    BOOL            mAllowEdit;
 };
 #endif /* LLTIMECTRL_H_ */