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/llfloaterexperiencepicker.h b/indra/newview/llfloaterexperiencepicker.h
index 49f96dfea0..0a001478f1 100644
--- a/indra/newview/llfloaterexperiencepicker.h
+++ b/indra/newview/llfloaterexperiencepicker.h
@@ -43,14 +43,14 @@ public:
     typedef boost::function<bool (const LLSD&)> filter_function;
     typedef std::vector<filter_function> filter_list;
 
-    static LLFloaterExperiencePicker* show( select_callback_t callback, const LLUUID& key, BOOL allow_multiple, BOOL close_on_select, filter_list filters, LLView * frustumOrigin);
+    static LLFloaterExperiencePicker* show( select_callback_t callback, const LLUUID& key, bool allow_multiple, bool close_on_select, filter_list filters, LLView * frustumOrigin);
 
     LLFloaterExperiencePicker(const LLSD& key);
     virtual ~LLFloaterExperiencePicker();
 
-    BOOL postBuild();
+    bool postBuild() override;
 
-    virtual void    draw();
+    void draw() override;
 private:
 
     LLPanelExperiencePicker* mSearchPanel;