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

Merge remote-tracking branch 'aleric/V2MultiWear' into AltCompilers

Browse Source
This commit is contained in:
Drake Arconis
2012-07-02 21:08:04 +00:00
parent d703b4e076 221e3908b9
commit 8eb319d3ba
29 changed files with 523 additions and 1812 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llviewercontrol.cpp
View File

@@ -87,7 +87,7 @@
BOOL gHackGodmode = FALSE;
#endif
AITHREADSAFE(settings_map_type, gSettings,);
AIThreadSafeDC<settings_map_type> gSettings;
LLControlGroup gSavedSettings("Global"); // saved at end of session
LLControlGroup gSavedPerAccountSettings("PerAccount"); // saved at end of session
LLControlGroup gColors("Colors"); // saved at end of session