Merge pull request #2494 from secondlife/marchcat/b-develop

Maint B sync

1 files changed, 11 insertions, 11 deletions

diff --git a/indra/llui/llsliderctrl.h b/indra/llui/llsliderctrl.h
index 48e59045a7..311377a61f 100644
--- a/indra/llui/llsliderctrl.h
+++ b/indra/llui/llsliderctrl.h
@@ -84,17 +84,17 @@ public:
     virtual ~LLSliderCtrl();
 
     /*virtual*/ F32 getValueF32() const { return mSlider->getValueF32(); }
-    void            setValue(F32 v, BOOL from_event = FALSE);
+    void            setValue(F32 v, bool from_event = false);
 
-    /*virtual*/ void    setValue(const LLSD& value) { setValue((F32)value.asReal(), TRUE); }
+    /*virtual*/ void    setValue(const LLSD& value) { setValue((F32)value.asReal(), true); }
     /*virtual*/ LLSD    getValue() const            { return LLSD(getValueF32()); }
-    /*virtual*/ BOOL    setLabelArg( const std::string& key, const LLStringExplicit& text );
+    /*virtual*/ bool    setLabelArg( const std::string& key, const LLStringExplicit& text );
 
-    BOOL            isMouseHeldDown() const { return mSlider->hasMouseCapture(); }
+    bool            isMouseHeldDown() const { return mSlider->hasMouseCapture(); }
 
     virtual void    setPrecision(S32 precision);
 
-    /*virtual*/ void    setEnabled( BOOL b );
+    /*virtual*/ void    setEnabled( bool b );
     /*virtual*/ void    clear();
 
     /*virtual*/ void    setMinValue(const LLSD& min_value)  { setMinValue((F32)min_value.asReal()); }
@@ -107,8 +107,8 @@ public:
     F32             getMaxValue() const { return mSlider->getMaxValue(); }
 
     void            setLabel(const LLStringExplicit& label)     { if (mLabelBox) mLabelBox->setText(label); }
-    void            setLabelColor(const LLColor4& c)            { mTextEnabledColor = c; }
-    void            setDisabledLabelColor(const LLColor4& c)    { mTextDisabledColor = c; }
+    void            setLabelColor(const LLUIColor& c)            { mTextEnabledColor = c; }
+    void            setDisabledLabelColor(const LLUIColor& c)    { mTextDisabledColor = c; }
 
     boost::signals2::connection setSliderMouseDownCallback( const commit_signal_t::slot_type& cb );
     boost::signals2::connection setSliderMouseUpCallback( const commit_signal_t::slot_type& cb );
@@ -116,7 +116,7 @@ public:
 
     /*virtual*/ void    onTabInto();
 
-    /*virtual*/ void    setTentative(BOOL b);           // marks value as tentative
+    /*virtual*/ void    setTentative(bool b);           // marks value as tentative
     /*virtual*/ void    onCommit();                     // mark not tentative, then commit
 
     /*virtual*/ void    setControlName(const std::string& control_name, LLView* context)
@@ -126,7 +126,7 @@ public:
     }
 
     /*virtual*/ void    setRect(const LLRect& rect);
-    /*virtual*/ void    reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
+    /*virtual*/ void    reshape(S32 width, S32 height, bool called_from_parent = true);
 
     static void     onSliderCommit(LLUICtrl* caller, const LLSD& userdata);
 
@@ -154,8 +154,8 @@ private:
 
     const LLFontGL* mFont;
     const LLFontGL* mLabelFont;
-    BOOL            mShowText;
-    BOOL            mCanEditText;
+    bool            mShowText;
+    bool            mCanEditText;
 
     S32             mPrecision;
     LLTextBox*      mLabelBox;