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

Fix build

master
Ansariel 2024-06-21 20:51:02 +02:00
parent b6ef96e98c
commit 14af436ce5
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/fsdata.cpp
View File

@ -259,7 +259,7 @@ static void downloadCompleteScript(LLSD const &aData, std::string const &aURL, s
LLXMLNodePtr xml_root; LLXMLNodePtr xml_root;
std::string stringData; 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 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] ), stringData.size(), xml_root, NULL)) || (xml_root.isNull()) || (!xml_root->hasName("script_library")) ) if ( (!LLXMLNode::parseBuffer( reinterpret_cast< U8*> ( &stringData[0] ), (U32)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; LL_WARNS("fsdata") << "Could not read the script library data from "<< aURL << LL_ENDL;
return; return;
@ -274,7 +274,7 @@ static void downloadCompleteScript(LLSD const &aData, std::string const &aURL, s
else else
{ {
LL_INFOS("fsdata") << "Saving " << aFilename << LL_ENDL; LL_INFOS("fsdata") << "Saving " << aFilename << LL_ENDL;
outfile.write( &rawData[0], rawData.size() ); outfile.write( &rawData[0], (S32)rawData.size() );
outfile.close() ; outfile.close() ;
} }
} }

2
indra/newview/fsgridhandler.cpp
View File

@ -121,7 +121,7 @@ void gridDownloadComplete( LLSD const &aData, LLGridManager* mOwner, GridEntry*
std::string stringData; 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 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] ), stringData.size(), mData->info_root, NULL)) if(LLXMLNode::parseBuffer( reinterpret_cast< U8*> ( &stringData[0] ), (U32)stringData.size(), mData->info_root, NULL))
{ {
mOwner->gridInfoResponderCB(mData); mOwner->gridInfoResponderCB(mData);
} }

1
indra/newview/llvoicevivox.cpp
View File

@ -326,7 +326,6 @@ LLVivoxVoiceClient::LLVivoxVoiceClient() :
mSpeakerMuteDirty(true), mSpeakerMuteDirty(true),
mMicVolume(0), mMicVolume(0),
mMicVolumeDirty(true), mMicVolumeDirty(true),
mHidden(false), // <FS:Ansariel> Initialize...
mVoiceEnabled(false), mVoiceEnabled(false),
mProcessChannels(false), mProcessChannels(false),