diff options
author | Brian McGroarty <soft@lindenlab.com> | 2008-03-19 00:01:42 +0000 |
---|---|---|
committer | Brian McGroarty <soft@lindenlab.com> | 2008-03-19 00:01:42 +0000 |
commit | 25de7377c1f6cc2fa6f217b9e9eaca84ab36748d (patch) | |
tree | ea1770b154433082dbcf06da043c0c3a45f7c5f3 /indra/newview/llstartup.cpp | |
parent | 2d9afdaa03f0d44d05e3f2fb9d99dd5b059a9cac (diff) |
QAR-377 maintenance-6 merge:
svn merge -r 82602:82644 svn+ssh://svn/svn/linden/qa/maintenance-6-merge-82557 release/
Diffstat (limited to 'indra/newview/llstartup.cpp')
-rw-r--r-- | indra/newview/llstartup.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index d2bc8f4100..13dfe45f3e 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -1021,7 +1021,6 @@ BOOL idle_startup() gSkipOptionalUpdate, gAcceptTOS, gAcceptCriticalMessage, - gViewerDigest, gLastExecEvent, requested_options, hashed_mac_string, |