diff --git a/indra/llrender/llpostprocess.cpp b/indra/llrender/llpostprocess.cpp index 846badc60..2cedee327 100644 --- a/indra/llrender/llpostprocess.cpp +++ b/indra/llrender/llpostprocess.cpp @@ -565,13 +565,13 @@ void LLPostProcess::setSelectedEffect(std::string const & effectName) } } -void LLPostProcess::setSelectedEffectValue(std::string const & setting, LLSD& value) +void LLPostProcess::setSelectedEffectValue(std::string const & setting, LLSD value) { char buf[256]; S32 elem=0; if(sscanf(setting.c_str(),"%255[^[][%d]", buf, &elem) == 2) { - mSelectedEffectInfo[std::string(buf)][elem] = value; + mSelectedEffectInfo[static_cast(buf)][elem] = value; } else { diff --git a/indra/llrender/llpostprocess.h b/indra/llrender/llpostprocess.h index 830598a92..ec076842d 100644 --- a/indra/llrender/llpostprocess.h +++ b/indra/llrender/llpostprocess.h @@ -149,7 +149,7 @@ public: inline LLSD const & getSelectedEffectInfo(void) const { return mSelectedEffectInfo; } // Setters void setSelectedEffect(std::string const & effectName); - void setSelectedEffectValue(std::string const & setting, LLSD& value); + void setSelectedEffectValue(std::string const & setting, LLSD value); void resetSelectedEffect(); void saveEffectAs(std::string const & effectName); }; diff --git a/indra/newview/skins/default/xui/en-us/floater_post_process.xml b/indra/newview/skins/default/xui/en-us/floater_post_process.xml index 8280d1f84..12e3d8ad6 100644 --- a/indra/newview/skins/default/xui/en-us/floater_post_process.xml +++ b/indra/newview/skins/default/xui/en-us/floater_post_process.xml @@ -146,25 +146,25 @@ left="14" max_val="1" min_val="0" mouse_opaque="true" name="noise_strength" show_text="true" value="1.0" width="220" /> - - - - Layer Count - - - + + + + Layer Count + + +