From 955e5c6cb4a2b61e04358300deffd4e037793f60 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Fri, 19 Jul 2024 10:07:36 +0200 Subject: [PATCH] Make this thing build --- indra/newview/llfloaterpathfindingcharacters.cpp | 4 ++-- indra/newview/llvoicewebrtc.cpp | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/indra/newview/llfloaterpathfindingcharacters.cpp b/indra/newview/llfloaterpathfindingcharacters.cpp index ac84b31678..0df0e3c9ec 100644 --- a/indra/newview/llfloaterpathfindingcharacters.cpp +++ b/indra/newview/llfloaterpathfindingcharacters.cpp @@ -283,10 +283,10 @@ void LLFloaterPathfindingCharacters::showCapsule() const llassert(mSelectedCharacterId == character->getUUID()); if (LLPathingLib::getInstance() != NULL) { - // Interface in Nicky's physics stub package expects bool while Havok package still expects BOOL + // Interface in Nicky's physics stub package expects bool while Havok package still expects BOOL aka S32 #ifdef HAVOK_TPV LLPathingLib::getInstance()->createPhysicsCapsuleRep(character->getLength(), character->getRadius(), - (BOOL)character->isHorizontal(), character->getUUID()); + static_cast(character->isHorizontal()), character->getUUID()); #else LLPathingLib::getInstance()->createPhysicsCapsuleRep(character->getLength(), character->getRadius(), character->isHorizontal(), character->getUUID()); diff --git a/indra/newview/llvoicewebrtc.cpp b/indra/newview/llvoicewebrtc.cpp index f740466f78..802b3a4337 100644 --- a/indra/newview/llvoicewebrtc.cpp +++ b/indra/newview/llvoicewebrtc.cpp @@ -24,7 +24,6 @@ * $/LicenseInfo$ */ #include -#include #include "llvoicewebrtc.h" #include "llsdutil.h"