summaryrefslogtreecommitdiff
path: root/indra/newview/llviewercontrol.cpp
diff options
context:
space:
mode:
authorGraham Linden <graham@lindenlab.com>2013-08-26 14:57:54 -0700
committerGraham Linden <graham@lindenlab.com>2013-08-26 14:57:54 -0700
commitc50f44e04ed4c14dd19b18421878cc0094cee9b2 (patch)
treebd7418ba39e5aeac26c31df3b5dd7d4e4b676e73 /indra/newview/llviewercontrol.cpp
parentbf55d287db305907b83909c09bc5842a5a7a709f (diff)
parent6e1138585bf745f73f0bb99ca62f77eeb273f1e4 (diff)
Merge viewer-release 3.6.5
Diffstat (limited to 'indra/newview/llviewercontrol.cpp')
-rwxr-xr-xindra/newview/llviewercontrol.cpp4
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