diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2013-08-05 19:44:12 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2013-08-05 19:44:12 -0400 |
| commit | f4943bb2e6d59103d6e6a511ff8f06adb1c90a41 (patch) | |
| tree | f0b89a006e52e38039d142048adf9034cbcb2b76 /indra/newview/llviewercontrol.cpp | |
| parent | 32b8d398eca5eaa4ca99aa48839ad64d97954cae (diff) | |
| parent | 7f6e7fc0cb15d5367d48a3d8084d1a0b319575b7 (diff) | |
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
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 |