summaryrefslogtreecommitdiff
path: root/indra/newview/llstartup.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2013-10-03 19:05:52 -0700
committerRichard Linden <none@none>2013-10-03 19:05:52 -0700
commitbee38adb347213bc1824dad8a762dc399c3065ec (patch)
treeb1db05808d35d0dcc168a799f8a2a47b6d1160e0 /indra/newview/llstartup.cpp
parent9ae025f8ee8688b25678a243ba19f1398de08060 (diff)
parentf8a85003ddd4bee1ae00fc329c1c1d66d6100cbd (diff)
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/newview/llstartup.cpp')
-rwxr-xr-xindra/newview/llstartup.cpp4
1 files changed, 0 insertions, 4 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 39ced906ad..72c76f9424 100755
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -2176,10 +2176,6 @@ bool idle_startup()
// reset keyboard focus to sane state of pointing at world
gFocusMgr.setKeyboardFocus(NULL);
-#if 0 // sjb: enable for auto-enabling timer display
- gDebugView->mFastTimerView->setVisible(TRUE);
-#endif
-
LLAppViewer::instance()->handleLoginComplete();
LLAgentPicksInfo::getInstance()->requestNumberOfPicks();