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

Merge Shyotl

Browse Source
This commit is contained in:
Siana Gearz
2010-11-11 21:54:47 +01:00
parent 29584c7a28 3604f98734
commit 5a49ceab6d
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
indra/llxml/llcontrol.cpp
View File

@@ -303,11 +303,8 @@ LLPointer<LLControlVariable> LLControlGroup::getControl(const std::string& name)
gSettingsCallMap.push_back(std::pair<std::string, U32>(name.c_str(),1));
}
#endif //PROF_CTRL_CALLS
//return iter == mNameTable.end() ? LLPointer<LLControlVariable>() : iter->second;
LLControlVariable *pFoundVar = (iter != mNameTable.end()) ? iter->second : (LLPointer<LLControlVariable>) NULL;
if(pFoundVar)
return pFoundVar->getCOAActive();
if(iter != mNameTable.end())
return iter->second->getCOAActive();
else
return LLPointer<LLControlVariable>();
}
@@ -1097,6 +1094,7 @@ U32 LLControlGroup::loadFromFile(const std::string& filename, bool set_default_v
{
if(mIncludedFiles.find(filename) != mIncludedFiles.end())
return 0; //Already included this file.
mIncludedFiles.insert(filename);
std::string name;
LLSD settings;