diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2024-08-13 15:32:47 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2024-08-13 15:32:47 -0400 |
| commit | 23f2631d598b6e07450a96ed1ec00670c8867cdd (patch) | |
| tree | 20195c1688ad8cb7e8631c97fa5920624f10972c /indra/newview/llinspecttoast.cpp | |
| parent | 54334ff6e377e35c97df3a0fe2a859795ec07b21 (diff) | |
| parent | 8ce3323269d95f54e2b768c4c5aa154d4afbbb6b (diff) | |
Merge branch 'develop' into nat/edu-channel
Diffstat (limited to 'indra/newview/llinspecttoast.cpp')
| -rw-r--r-- | indra/newview/llinspecttoast.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/llinspecttoast.cpp b/indra/newview/llinspecttoast.cpp index 2e05893489..e3bf960c6d 100644 --- a/indra/newview/llinspecttoast.cpp +++ b/indra/newview/llinspecttoast.cpp @@ -46,7 +46,7 @@ public: virtual ~LLInspectToast(); /*virtual*/ void onOpen(const LLSD& notification_id); - /*virtual*/ BOOL handleToolTip(S32 x, S32 y, MASK mask); + /*virtual*/ bool handleToolTip(S32 x, S32 y, MASK mask); /*virtual*/ void deleteAllChildren(); /*virtual*/ void removeChild(LLView* child); private: @@ -96,14 +96,14 @@ void LLInspectToast::onOpen(const LLSD& notification_id) LL_WARNS() << "Could not get toast's panel." << LL_ENDL; return; } - panel->setVisible(TRUE); - panel->setMouseOpaque(FALSE); + panel->setVisible(true); + panel->setMouseOpaque(false); if(mPanel != NULL && mPanel->getParent() == this) { LLInspect::removeChild(mPanel); } addChild(panel); - panel->setFocus(TRUE); + panel->setFocus(true); mPanel = panel; @@ -115,7 +115,7 @@ void LLInspectToast::onOpen(const LLSD& notification_id) } // virtual -BOOL LLInspectToast::handleToolTip(S32 x, S32 y, MASK mask) +bool LLInspectToast::handleToolTip(S32 x, S32 y, MASK mask) { // We don't like the way LLInspect handles tooltips // (black tooltips look weird), |