diff options
| author | Brad Linden <46733234+brad-linden@users.noreply.github.com> | 2024-05-06 15:44:19 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-06 15:44:19 -0700 |
| commit | 84827a7cb8d4b7a58309f98c7d4df4cfeb173935 (patch) | |
| tree | b91494298eab93bbd8dd9b00722b7a30714a1b9c /indra/newview/llinspecttoast.cpp | |
| parent | 76101843c0d390c25a783f212eb1ea75e508ada4 (diff) | |
| parent | 8b747cee182cd8e95063fa152d9b5d7383cb1c74 (diff) | |
Merge pull request #1413 from secondlife/gltf-dev-maint-a-merge
Merge Maint A to development
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 6f93a78ca6..38272098a3 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), |