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

Compile fixies~

Browse Source
This commit is contained in:
Lirusaito
2012-08-01 09:13:40 -04:00
parent e03de192c8
commit 73fedf453c
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llmath/lloctree.h
View File

@@ -457,7 +457,7 @@ public:
mDataEnd = NULL;
}
notifyRemoval(data);
this->notifyRemoval(data);
checkAlive();
}

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