diff options
author | simon <none@none> | 2013-08-26 15:45:09 -0700 |
---|---|---|
committer | simon <none@none> | 2013-08-26 15:45:09 -0700 |
commit | 90d1c5b3676fe4e8ea8668b41fdf92613d5f102d (patch) | |
tree | 8d5afd9678fd44444bcc7b5d311b5cfb7abe5217 /indra/newview/llviewercontrol.cpp | |
parent | ac2dc34ed0abbac8d5a8eb7f887037fe387c6a7a (diff) | |
parent | 27d637d0f14fdfff496256222dc1343d2d7ee9ae (diff) |
Merge downstream code for CHUIStorm
Diffstat (limited to 'indra/newview/llviewercontrol.cpp')
-rwxr-xr-x | indra/newview/llviewercontrol.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llviewercontrol.cpp b/indra/newview/llviewercontrol.cpp index afbb59e723..744ec4de2b 100755 --- a/indra/newview/llviewercontrol.cpp +++ b/indra/newview/llviewercontrol.cpp @@ -83,7 +83,9 @@ BOOL gHackGodmode = FALSE; #endif - +// Should you contemplate changing the name "Global", please first grep for +// that string literal. There are at least a couple other places in the C++ +// code that assume the LLControlGroup named "Global" is gSavedSettings. LLControlGroup gSavedSettings("Global"); // saved at end of session LLControlGroup gSavedPerAccountSettings("PerAccount"); // saved at end of session LLControlGroup gCrashSettings("CrashSettings"); // saved at end of session |