diff --git a/indra/llrender/llshadermgr.h b/indra/llrender/llshadermgr.h index ec2ba880b22fef4628b01c80a43fba7764f2b706..97515df40a00804f866ee8d96064e05f483d32b3 100644 --- a/indra/llrender/llshadermgr.h +++ b/indra/llrender/llshadermgr.h @@ -289,9 +289,6 @@ class LLShaderMgr std::vector<std::string> mReservedUniforms; - //preprocessor definitions (name/value) - std::map<std::string, std::string> mDefinitions; - protected: // our parameter manager singleton instance diff --git a/indra/llui/lltrans.h b/indra/llui/lltrans.h index 16c690fad9e1ace8bbca9ae69e060b58c06781e4..a8a82d79835d6562816cb83af6436767abce9752 100644 --- a/indra/llui/lltrans.h +++ b/indra/llui/lltrans.h @@ -42,7 +42,7 @@ class LLSD; class LLTransTemplate { public: - LLTransTemplate(const std::string name = std::string(), const std::string text = std::string()) : mName(std::move(name)), mText(std::move(text)) {} + LLTransTemplate(std::string name = std::string(), std::string text = std::string()) : mName(std::move(name)), mText(std::move(text)) {} std::string mName; std::string mText;