Merge branch 'DRTVWR-600-maint-A' into signal/trim-trailing

1 files changed, 15 insertions, 15 deletions

diff --git a/indra/llwindow/llkeyboard.h b/indra/llwindow/llkeyboard.h
index 2618f9f022..7f8d0af155 100644
--- a/indra/llwindow/llkeyboard.h
+++ b/indra/llwindow/llkeyboard.h
@@ -64,20 +64,20 @@ public:
 
     F32             getCurKeyElapsedTime()  { return getKeyDown(mCurScanKey) ? getKeyElapsedTime( mCurScanKey ) : 0.f; }
     F32             getCurKeyElapsedFrameCount()    { return getKeyDown(mCurScanKey) ? (F32)getKeyElapsedFrameCount( mCurScanKey ) : 0.f; }
-    BOOL            getKeyDown(const KEY key) { return mKeyLevel[key]; }
-    BOOL            getKeyRepeated(const KEY key) { return mKeyRepeated[key]; }
+    bool            getKeyDown(const KEY key) { return mKeyLevel[key]; }
+    bool            getKeyRepeated(const KEY key) { return mKeyRepeated[key]; }
 
-    BOOL            translateKey(const U16 os_key, KEY *translated_key);
+    bool            translateKey(const U16 os_key, KEY *translated_key);
     U16             inverseTranslateKey(const KEY translated_key);
-    BOOL            handleTranslatedKeyUp(KEY translated_key, U32 translated_mask);     // Translated into "Linden" keycodes
-    BOOL            handleTranslatedKeyDown(KEY translated_key, U32 translated_mask);   // Translated into "Linden" keycodes
+    bool            handleTranslatedKeyUp(KEY translated_key, U32 translated_mask);     // Translated into "Linden" keycodes
+    bool            handleTranslatedKeyDown(KEY translated_key, U32 translated_mask);   // Translated into "Linden" keycodes
 
 
-    virtual BOOL    handleKeyUp(const U16 key, MASK mask) = 0;
-    virtual BOOL    handleKeyDown(const U16 key, MASK mask) = 0;
+    virtual bool    handleKeyUp(const U16 key, MASK mask) = 0;
+    virtual bool    handleKeyDown(const U16 key, MASK mask) = 0;
 
 #ifdef LL_DARWIN
-    // We only actually use this for OS X.
+    // We only actually use this for macOS.
     virtual void    handleModifier(MASK mask) = 0;
 #endif // LL_DARWIN
 
@@ -87,14 +87,14 @@ public:
     virtual void    scanKeyboard() = 0;                                                         // scans keyboard, calls functions as necessary
     // Mac must differentiate between Command = Control for keyboard events
     // and Command != Control for mouse events.
-    virtual MASK    currentMask(BOOL for_mouse_event) = 0;
+    virtual MASK    currentMask(bool for_mouse_event) = 0;
     virtual KEY     currentKey() { return mCurTranslatedKey; }
 
     EKeyboardInsertMode getInsertMode() { return mInsertMode; }
     void toggleInsertMode();
 
-    static BOOL     maskFromString(const std::string& str, MASK *mask);     // False on failure
-    static BOOL     keyFromString(const std::string& str, KEY *key);            // False on failure
+    static bool     maskFromString(const std::string& str, MASK *mask);     // False on failure
+    static bool     keyFromString(const std::string& str, KEY *key);            // False on failure
     static std::string stringFromKey(KEY key, bool translate = true);
     static std::string stringFromMouse(EMouseClickType click, bool translate = true);
     static std::string stringFromAccelerator( MASK accel_mask ); // separated for convinience, returns with "+": "Shift+" or "Shift+Alt+"...
@@ -117,10 +117,10 @@ protected:
 
     LLTimer         mKeyLevelTimer[KEY_COUNT];  // Time since level was set
     S32             mKeyLevelFrameCount[KEY_COUNT]; // Frames since level was set
-    BOOL            mKeyLevel[KEY_COUNT];       // Levels
-    BOOL            mKeyRepeated[KEY_COUNT];    // Key was repeated
-    BOOL            mKeyUp[KEY_COUNT];          // Up edge
-    BOOL            mKeyDown[KEY_COUNT];        // Down edge
+    bool            mKeyLevel[KEY_COUNT];       // Levels
+    bool            mKeyRepeated[KEY_COUNT];    // Key was repeated
+    bool            mKeyUp[KEY_COUNT];          // Up edge
+    bool            mKeyDown[KEY_COUNT];        // Down edge
     KEY             mCurTranslatedKey;
     KEY             mCurScanKey;        // Used during the scanKeyboard()