Merge pull request #1745 from secondlife/project/gltf_development

move project/gltf development to develop

1 files changed, 4 insertions, 4 deletions

diff --git a/indra/newview/llfloatertools.h b/indra/newview/llfloatertools.h
index f6e03afc11..f9c3b401bb 100644
--- a/indra/newview/llfloatertools.h
+++ b/indra/newview/llfloatertools.h
@@ -55,7 +55,7 @@ class LLFloaterTools
 : public LLFloater
 {
 public:
-    virtual BOOL    postBuild();
+    virtual bool    postBuild();
     static  void*   createPanelPermissions(void*    vdata);
     static  void*   createPanelObject(void* vdata);
     static  void*   createPanelVolume(void* vdata);
@@ -67,7 +67,7 @@ public:
     virtual ~LLFloaterTools();
 
     /*virtual*/ void onOpen(const LLSD& key);
-    /*virtual*/ BOOL canClose();
+    /*virtual*/ bool canClose();
     /*virtual*/ void onClose(bool app_quitting);
     /*virtual*/ void draw();
     /*virtual*/ void onFocusReceived();
@@ -181,8 +181,8 @@ public:
     LLObjectSelectionHandle mObjectSelection;
 
 private:
-    BOOL                    mDirty;
-    BOOL                    mHasSelection;
+    bool                    mDirty;
+    bool                    mHasSelection;
 
     std::map<std::string, std::string> mStatusText;