From 4e4b3bd404f461ca63593743d00f685360f0a549 Mon Sep 17 00:00:00 2001 From: Zi Ree Date: Thu, 22 Feb 2024 17:45:33 +0100 Subject: [PATCH] fix leftover BOOL, TRUE and FALSE --- indra/llui/llscrolllistctrl.cpp | 2 +- indra/llwindow/llkeyboardsdl2.cpp | 10 +++++----- indra/newview/lllegacyatmospherics.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp index e40646f7ab..ccefdbb9e9 100644 --- a/indra/llui/llscrolllistctrl.cpp +++ b/indra/llui/llscrolllistctrl.cpp @@ -3968,7 +3968,7 @@ void LLScrollListCtrl::loadPersistedSortOrder() for (LLSD::array_iterator it = sort_order.beginArray(); it != sort_order.endArray(); ++it) { S32 sort_val = (*it).asInteger(); - BOOL ascending = sort_val > 0; + bool ascending = sort_val > 0; sort_val = llabs(sort_val) - 1; setSort(sort_val, ascending); diff --git a/indra/llwindow/llkeyboardsdl2.cpp b/indra/llwindow/llkeyboardsdl2.cpp index 163c357105..c214d5ac41 100644 --- a/indra/llwindow/llkeyboardsdl2.cpp +++ b/indra/llwindow/llkeyboardsdl2.cpp @@ -140,17 +140,17 @@ void LLKeyboardSDL::resetMaskKeys() if(mask & KMOD_SHIFT) { - mKeyLevel[KEY_SHIFT] = TRUE; + mKeyLevel[KEY_SHIFT] = true; } if(mask & KMOD_CTRL) { - mKeyLevel[KEY_CONTROL] = TRUE; + mKeyLevel[KEY_CONTROL] = true; } if(mask & KMOD_ALT) { - mKeyLevel[KEY_ALT] = TRUE; + mKeyLevel[KEY_ALT] = true; } } @@ -282,8 +282,8 @@ void LLKeyboardSDL::scanKeyboard() // Reset edges for next frame for (S32 key = 0; key < KEY_COUNT; key++) { - mKeyUp[key] = FALSE; - mKeyDown[key] = FALSE; + mKeyUp[key] = false; + mKeyDown[key] = false; if (mKeyLevel[key]) { mKeyLevelFrameCount[key]++; diff --git a/indra/newview/lllegacyatmospherics.h b/indra/newview/lllegacyatmospherics.h index d48f3040c3..9dec90f03d 100644 --- a/indra/newview/lllegacyatmospherics.h +++ b/indra/newview/lllegacyatmospherics.h @@ -267,7 +267,7 @@ protected: F32 mHazeConcentration; F32 mCloudDensity; F32 mWind; - BOOL mInitialized; + bool mInitialized; LLVector3 mLastLightingDirection; LLColor3 mLastTotalAmbient; F32 mAmbientScale;