livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make this thing build

master
Ansariel 2024-07-19 10:07:36 +02:00
parent 130c1955ca
commit 955e5c6cb4
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llfloaterpathfindingcharacters.cpp
View File

@ -283,10 +283,10 @@ void LLFloaterPathfindingCharacters::showCapsule() const
llassert(mSelectedCharacterId == character->getUUID());
if (LLPathingLib::getInstance() != NULL)
{
// <FS:Ansariel> Interface in Nicky's physics stub package expects bool while Havok package still expects BOOL
// <FS:Ansariel> 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<S32>(character->isHorizontal()), character->getUUID());
#else
LLPathingLib::getInstance()->createPhysicsCapsuleRep(character->getLength(), character->getRadius(),
character->isHorizontal(), character->getUUID());

1
indra/newview/llvoicewebrtc.cpp
View File

@ -24,7 +24,6 @@
* $/LicenseInfo$
*/
#include <algorithm>
#include <format>
#include "llvoicewebrtc.h"
#include "llsdutil.h"