From 6ecb0278dbb09e1f91ecabd78b24538d30a04eb6 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Tue, 9 Jul 2024 09:17:15 +0200 Subject: [PATCH] Fix OpenSim build --- indra/newview/fsdata.cpp | 2 +- indra/newview/fsgridhandler.cpp | 2 +- indra/newview/fsslurl.cpp | 6 +++--- indra/newview/llpathfindingpathtool.cpp | 4 ++++ 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/indra/newview/fsdata.cpp b/indra/newview/fsdata.cpp index f6416539a5..8adb3a6adc 100644 --- a/indra/newview/fsdata.cpp +++ b/indra/newview/fsdata.cpp @@ -259,7 +259,7 @@ static void downloadCompleteScript(LLSD const &aData, std::string const &aURL, s LLXMLNodePtr xml_root; std::string stringData; stringData.assign( rawData.begin(), rawData.end() ); // LLXMLNode::parseBuffer wants a U8*, not a const U8*, so need to copy here just to be safe - if ( (!LLXMLNode::parseBuffer( reinterpret_cast< U8*> ( &stringData[0] ), (U32)stringData.size(), xml_root, NULL)) || (xml_root.isNull()) || (!xml_root->hasName("script_library")) ) + if ( (!LLXMLNode::parseBuffer( reinterpret_cast ( &stringData[0] ), (U64)stringData.size(), xml_root, NULL)) || (xml_root.isNull()) || (!xml_root->hasName("script_library")) ) { LL_WARNS("fsdata") << "Could not read the script library data from "<< aURL << LL_ENDL; return; diff --git a/indra/newview/fsgridhandler.cpp b/indra/newview/fsgridhandler.cpp index c7bd4bff65..b4c4a8efa4 100644 --- a/indra/newview/fsgridhandler.cpp +++ b/indra/newview/fsgridhandler.cpp @@ -121,7 +121,7 @@ void gridDownloadComplete( LLSD const &aData, LLGridManager* mOwner, GridEntry* std::string stringData; stringData.assign( rawData.begin(), rawData.end() ); // LLXMLNode::parseBuffer wants a U8*, not a const U8*, so need to copy here just to be safe - if(LLXMLNode::parseBuffer( reinterpret_cast< U8*> ( &stringData[0] ), (U32)stringData.size(), mData->info_root, NULL)) + if(LLXMLNode::parseBuffer( reinterpret_cast ( &stringData[0] ), (U64)stringData.size(), mData->info_root, NULL)) { mOwner->gridInfoResponderCB(mData); } diff --git a/indra/newview/fsslurl.cpp b/indra/newview/fsslurl.cpp index d6a7d61e9a..88c67963a2 100644 --- a/indra/newview/fsslurl.cpp +++ b/indra/newview/fsslurl.cpp @@ -458,14 +458,14 @@ LLSLURL::LLSLURL(const std::string& grid, const std::string& region, const LLVec // mType = LOCATION; // FIRE-8063 - Aurora sim var region teleports - //mPosition = LLVector3(x, y, z); + //mPosition = LLVector3((F32)x, (F32)y, (F32)z); if(!LLGridManager::getInstance()->isInOpenSim()) { S32 x = ll_round( (F32)fmod( position[VX], (F32)REGION_WIDTH_METERS ) ); S32 y = ll_round( (F32)fmod( position[VY], (F32)REGION_WIDTH_METERS ) ); S32 z = ll_round( (F32)position[VZ] ); - mPosition = LLVector3(x, y, z); + mPosition = LLVector3((F32)x, (F32)y, (F32)z); } // } @@ -491,7 +491,7 @@ LLSLURL::LLSLURL(const std::string& region, const LLVector3& position, bool hype // S32 y = ll_round( (F32)fmod( (F32)global_position.mdV[VY], (F32)REGION_WIDTH_METERS ) ); // S32 z = ll_round( (F32)global_position.mdV[VZ] ); -// *this = LLSLURL(grid, region, LLVector3(x, y, z)); +// *this = LLSLURL(grid, region, LLVector3((F32)x, (F32)y, (F32)z)); // //} // diff --git a/indra/newview/llpathfindingpathtool.cpp b/indra/newview/llpathfindingpathtool.cpp index 1d04ebd145..41bfd644d0 100644 --- a/indra/newview/llpathfindingpathtool.cpp +++ b/indra/newview/llpathfindingpathtool.cpp @@ -230,7 +230,11 @@ LLPathfindingPathTool::EPathStatus LLPathfindingPathTool::getPathStatus() const F32 LLPathfindingPathTool::getCharacterWidth() const { +#ifdef HAVOK_TPV return mFinalPathData.mCharacterWidth; +#else + return (F32)mFinalPathData.mCharacterWidth; +#endif } void LLPathfindingPathTool::setCharacterWidth(F32 pCharacterWidth)