Merge pull request #1745 from secondlife/project/gltf_development

move project/gltf development to develop

1 files changed, 3 insertions, 3 deletions

diff --git a/indra/newview/llscrollingpanelparambase.h b/indra/newview/llscrollingpanelparambase.h
index 74682bb71c..9deafcc81a 100644
--- a/indra/newview/llscrollingpanelparambase.h
+++ b/indra/newview/llscrollingpanelparambase.h
@@ -42,10 +42,10 @@ class LLScrollingPanelParamBase : public LLScrollingPanel
 {
 public:
     LLScrollingPanelParamBase( const LLPanel::Params& panel_params,
-                   LLViewerJointMesh* mesh, LLViewerVisualParam* param, BOOL allow_modify, LLWearable* wearable, LLJoint* jointp, BOOL use_hints = FALSE );
+                   LLViewerJointMesh* mesh, LLViewerVisualParam* param, bool allow_modify, LLWearable* wearable, LLJoint* jointp, bool use_hints = false );
     virtual ~LLScrollingPanelParamBase();
 
-    virtual void        updatePanel(BOOL allow_modify);
+    void                updatePanel(bool allow_modify) override;
 
     static void         onSliderMoved(LLUICtrl* ctrl, void* userdata);
 
@@ -55,7 +55,7 @@ public:
 public:
     LLViewerVisualParam* mParam;
 protected:
-    BOOL mAllowModify;
+    bool mAllowModify;
     LLWearable *mWearable;
 };