Merge branch 'develop' into nat/edu-channel

1 files changed, 5 insertions, 5 deletions

diff --git a/indra/llwindow/llkeyboardwin32.h b/indra/llwindow/llkeyboardwin32.h
index 838566d69c..d0dfc5cfdd 100644
--- a/indra/llwindow/llkeyboardwin32.h
+++ b/indra/llwindow/llkeyboardwin32.h
@@ -39,17 +39,17 @@ public:
     LLKeyboardWin32();
     /*virtual*/ ~LLKeyboardWin32() {};
 
-    /*virtual*/ BOOL    handleKeyUp(const U16 key, MASK mask);
-    /*virtual*/ BOOL    handleKeyDown(const U16 key, MASK mask);
+    /*virtual*/ bool    handleKeyUp(const U16 key, MASK mask);
+    /*virtual*/ bool    handleKeyDown(const U16 key, MASK mask);
     /*virtual*/ void    resetMaskKeys();
-    /*virtual*/ MASK    currentMask(BOOL for_mouse_event);
+    /*virtual*/ MASK    currentMask(bool for_mouse_event);
     /*virtual*/ void    scanKeyboard();
-    BOOL                translateExtendedKey(const U16 os_key, const MASK mask, KEY *translated_key);
+    bool                translateExtendedKey(const U16 os_key, const MASK mask, KEY *translated_key);
     U16                 inverseTranslateExtendedKey(const KEY translated_key);
 
 protected:
     MASK    updateModifiers();
-    //void  setModifierKeyLevel( KEY key, BOOL new_state );
+    //void  setModifierKeyLevel( KEY key, bool new_state );
 private:
     std::map<U16, KEY> mTranslateNumpadMap;
     std::map<KEY, U16> mInvTranslateNumpadMap;