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

Merged with RLVa refactoring tip 

--HG--
branch : RLVa
meow-7.2.2
Kitty Barnett 2016-06-11 22:48:54 +02:00
parent 7c89967a1d e7bf8c2111
commit ecdf5e3edc
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/rlvcommon.cpp
View File

@ -191,7 +191,7 @@ void RlvStrings::initClass()
// Checked: 2011-11-08 (RLVa-1.5.0)
void RlvStrings::loadFromFile(const std::string& strFilePath, bool fUserOverride)
{
llifstream fileStream(strFilePath, std::ios::binary); LLSD sdFileData;
llifstream fileStream(strFilePath.c_str(), std::ios::binary); LLSD sdFileData;
if ( (!fileStream.is_open()) || (!LLSDSerialize::fromXMLDocument(sdFileData, fileStream)) )
return;
fileStream.close();

2
indra/newview/rlvfloaters.cpp
View File

@ -597,7 +597,7 @@ BOOL RlvFloaterStrings::postBuild()
pDefaultBtn->setCommitCallback(boost::bind(&RlvFloaterStrings::onStringRevertDefault, this));
// Read all string metadata from the default strings file
llifstream fileStream(RlvStrings::getStringMapPath(), std::ios::binary); LLSD sdFileData;
llifstream fileStream(RlvStrings::getStringMapPath().c_str(), std::ios::binary); LLSD sdFileData;
if ( (fileStream.is_open()) && (LLSDSerialize::fromXMLDocument(sdFileData, fileStream)) )
{
m_sdStringsInfo = sdFileData["strings"];