diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2013-07-26 09:00:01 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2013-07-26 09:00:01 -0400 |
| commit | 1bcce503a958e39d92206e8e0539fe664fdd1ece (patch) | |
| tree | f74e53e37177d39b243a9c66a69d6a6a8badaf9a /indra/newview/llviewercontrol.cpp | |
| parent | 10c8fbbedbee07355f71ef206c50957a422d7ccf (diff) | |
| parent | f7cdbb2582d6328e62220dc4955c89bafcad5565 (diff) | |
Automated merge with ssh://hg.lindenlab.com/nat/viewer-chop-951
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 |