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

Merge branch 'master' of git://github.com/Shyotl/SingularityViewer

Browse Source
This commit is contained in:
Lirusaito
2012-01-11 02:28:14 -05:00
parent c5d4ccc78d ced937cc46
commit 8543106f5e
31 changed files with 504 additions and 321 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
indra/llxml/llcontrol.cpp
View File

@@ -1150,7 +1150,7 @@ static std::string get_warn_name(const std::string& name)
return warnname;
}
void LLControlGroup::addWarning(const std::string& name)
LLControlVariable *LLControlGroup::addWarning(const std::string& name)
{
// Note: may get called more than once per warning
// (e.g. if allready loaded from a settings file),
@@ -1159,6 +1159,7 @@ void LLControlGroup::addWarning(const std::string& name)
std::string comment = std::string("Enables ") + name + std::string(" warning dialog");
declareBOOL(warnname, TRUE, comment);
mWarnings.insert(warnname);
return getControl(warnname);
}
BOOL LLControlGroup::getWarning(const std::string& name)

2
indra/llxml/llcontrol.h
View File

@@ -336,7 +336,7 @@ public:
// Ignorable Warnings
// Add a config variable to be reset on resetWarnings()
void addWarning(const std::string& name);
LLControlVariable *addWarning(const std::string& name);
BOOL getWarning(const std::string& name);
void setWarning(const std::string& name, BOOL val);