diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2024-08-28 20:47:43 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2024-08-28 20:47:43 -0400 |
| commit | cde1174345224d33d6b45b1e3243fa39043223e5 (patch) | |
| tree | 6c8db6e0499622d8c7206a11c997eb173ebd478f /indra/newview/llnavigationbar.h | |
| parent | 6f454ad8366ed33bbe199c3fc3ed69e6d3448cec (diff) | |
| parent | 35efadf78315f9b351415930dca4fae251ef4dd0 (diff) | |
Merge branch 'main' into release/luau-scripting.
Diffstat (limited to 'indra/newview/llnavigationbar.h')
| -rwxr-xr-x | indra/newview/llnavigationbar.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/llnavigationbar.h b/indra/newview/llnavigationbar.h index 56af1c134f..2bb6af24bc 100755 --- a/indra/newview/llnavigationbar.h +++ b/indra/newview/llnavigationbar.h @@ -60,9 +60,9 @@ public: } }; - /*virtual*/ BOOL handleMouseDown(S32 x, S32 y, MASK mask); + /*virtual*/ bool handleMouseDown(S32 x, S32 y, MASK mask); - /*virtual*/ BOOL handleMouseUp(S32 x, S32 y, MASK mask); + /*virtual*/ bool handleMouseUp(S32 x, S32 y, MASK mask); /*virtual*/ void onMouseLeave(S32 x, S32 y, MASK mask); @@ -93,9 +93,9 @@ class LLNavigationBar public: /*virtual*/ void draw() override; - /*virtual*/ BOOL handleRightMouseDown(S32 x, S32 y, MASK mask) override; - /*virtual*/ BOOL postBuild() override; - /*virtual*/ void setVisible(BOOL visible) override; + /*virtual*/ bool handleRightMouseDown(S32 x, S32 y, MASK mask) override; + /*virtual*/ bool postBuild() override; + /*virtual*/ void setVisible(bool visible) override; void handleLoginComplete(); void clearHistoryCache(); @@ -138,7 +138,7 @@ private: { if (LLNavigationBar::instanceExists()) { - LLNavigationBar::getInstance()->setEnabled(FALSE); + LLNavigationBar::getInstance()->setEnabled(false); } } |