From 3a55b1af3ee6243969a44bd5e70067ed299c0e91 Mon Sep 17 00:00:00 2001 From: Kitty Barnett Date: Sat, 11 Jun 2016 03:13:41 +0200 Subject: [PATCH 1/2] Keep GCC happy --HG-- branch : RLVa --- indra/newview/rlvcommon.cpp | 2 +- indra/newview/rlvfloaters.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/newview/rlvcommon.cpp b/indra/newview/rlvcommon.cpp index ae8d1e380c..f6e07b41c5 100644 --- a/indra/newview/rlvcommon.cpp +++ b/indra/newview/rlvcommon.cpp @@ -188,7 +188,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(); diff --git a/indra/newview/rlvfloaters.cpp b/indra/newview/rlvfloaters.cpp index b1dac2cf37..2ff3722797 100644 --- a/indra/newview/rlvfloaters.cpp +++ b/indra/newview/rlvfloaters.cpp @@ -589,7 +589,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"]; From e7bf8c2111ba3a55e33022eb832745ca8254c2a3 Mon Sep 17 00:00:00 2001 From: Kitty Barnett Date: Sat, 11 Jun 2016 20:27:08 +0200 Subject: [PATCH 2/2] Add a placeholder modifier so the refactor branch will compile for the outside world --HG-- branch : RLVa --- indra/newview/rlvdefines.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/indra/newview/rlvdefines.h b/indra/newview/rlvdefines.h index 27f591e7ce..5ee53c4a14 100644 --- a/indra/newview/rlvdefines.h +++ b/indra/newview/rlvdefines.h @@ -194,6 +194,8 @@ enum ERlvBehaviour { enum ERlvBehaviourModifier { + RLV_MODIFIER_PLACEHOLDER, + RLV_MODIFIER_COUNT, RLV_MODIFIER_UNKNOWN };