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

3
indra/llxml/llcontrol.h
View File

@@ -400,7 +400,8 @@ private:
template <> inline void LLCachedControl<LLColor4>::setValue(const LLSD& newvalue) template <> inline void LLCachedControl<LLColor4>::setValue(const LLSD& newvalue)
{ {
if(this->mControl->isType(TYPE_COL4U)) if(this->mControl->isType(TYPE_COL4U))
this->mCachedValue.set(LLColor4U(newvalue)); //a color4u LLSD cannot be auto-converted to color4.. so do it manually. //a color4u LLSD cannot be auto-converted to color4.. so do it manually.
this->mCachedValue.set(LLColor4U(newvalue));
else else
this->mCachedValue = (const LLColor4 &)newvalue; this->mCachedValue = (const LLColor4 &)newvalue;
} }

4
indra/newview/app_settings/settings_ascent.xml
View File

@@ -166,7 +166,7 @@
<key>Type</key> <key>Type</key>
<string>Boolean</string> <string>Boolean</string>
<key>Value</key> <key>Value</key>
<real>0</real> <integer>0</integer>
</map> </map>
<key>AscentUseStatusColors</key> <key>AscentUseStatusColors</key>
<map> <map>
@@ -177,7 +177,7 @@
<key>Type</key> <key>Type</key>
<string>Boolean</string> <string>Boolean</string>
<key>Value</key> <key>Value</key>
<real>0</real> <integer>0</integer>
</map> </map>
<key>AscentAvatarXModifier</key> <key>AscentAvatarXModifier</key>
<map> <map>