Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'future' of git://github.com/Lirusaito/SingularityViewer

Browse Source 
Conflicts:
	indra/llrender/llpostprocess.cpp
This commit is contained in:
Lirusaito
2012-08-10 23:39:06 -04:00
parent fda34fea46 be8b838334
commit f4324e8890
3 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/llrender/llpostprocess.cpp
View File

@@ -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<const char*>(buf)][elem] = value;
}
else
{

2
indra/llrender/llpostprocess.h
View File

@@ -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);
};