diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-09-11 08:47:33 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-09-11 08:47:33 -0400 |
| commit | 5eb6614913b97963d185afe698e677c880399c78 (patch) | |
| tree | c7e342b7b68192fc0eb4eba09ef52c17ac16ffa5 /indra/newview/llviewerwindow.cpp | |
| parent | 8189b28d2247bf99f76ace63e78021a43b5e15a1 (diff) | |
| parent | 2aadccd30843f3a29882d13ed2db50cebcba0374 (diff) | |
merge changes for DRTVWR-212
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index af2eec9ba8..30bb787fa7 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -4768,11 +4768,8 @@ void LLViewerWindow::requestResolutionUpdate() mResDirty = true; } -static LLFastTimer::DeclareTimer FTM_WINDOW_CHECK_SETTINGS("Window Settings"); - void LLViewerWindow::checkSettings() { - LLFastTimer t(FTM_WINDOW_CHECK_SETTINGS); if (mStatesDirty) { gGL.refreshState(); |