fix leftover BOOL, TRUE and FALSE
parent
915027b137
commit
4e4b3bd404
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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]++;
|
||||
|
|
|
|||
|
|
@ -267,7 +267,7 @@ protected:
|
|||
F32 mHazeConcentration;
|
||||
F32 mCloudDensity;
|
||||
F32 mWind;
|
||||
BOOL mInitialized;
|
||||
bool mInitialized;
|
||||
LLVector3 mLastLightingDirection;
|
||||
LLColor3 mLastTotalAmbient;
|
||||
F32 mAmbientScale;
|
||||
|
|
|
|||
Loading…
Reference in New Issue