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

Fix OpenSim build

meow-7.2.2
Ansariel 2024-07-09 09:17:15 +02:00
parent c8089f54f1
commit 6ecb0278db
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/fsdata.cpp
View File

@ -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<char*> ( &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;

2
indra/newview/fsgridhandler.cpp
View File

@ -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<char*> ( &stringData[0] ), (U64)stringData.size(), mData->info_root, NULL))
{
mOwner->gridInfoResponderCB(mData);
}

6
indra/newview/fsslurl.cpp
View File

@ -458,14 +458,14 @@ LLSLURL::LLSLURL(const std::string& grid, const std::string& region, const LLVec
// </FS:CR>
mType = LOCATION;
// <FS:CR> 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);
}
// </FS:CR>
}
@ -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));
// </FS:CR>
//}
//

4
indra/newview/llpathfindingpathtool.cpp
View File

@ -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)