summaryrefslogtreecommitdiff
path: root/indra/newview/llviewercontrol.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-08-19 15:15:15 -0400
committerOz Linden <oz@lindenlab.com>2013-08-19 15:15:15 -0400
commit82bf4e4db2bdb9effdf64e9edaa76a78913e25d3 (patch)
tree7f44a97fdf51222e743e18464d1b2d0ccb5b830e /indra/newview/llviewercontrol.cpp
parent731fe3e7c6287c63134c1a08572f9d97a0eb0ff0 (diff)
parent86b4019684af96a64a1d439851f177d7c18e4c24 (diff)
merge changes for DRTVWR-285
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