diff options
| author | callum <none@none> | 2012-06-15 13:00:49 -0700 |
|---|---|---|
| committer | callum <none@none> | 2012-06-15 13:00:49 -0700 |
| commit | 2eedd0c3c0fa8b4360c1402c1fb604010a4a2d82 (patch) | |
| tree | d2c5ccf950227d0b62d73b60f40ed61fbf64f473 /indra/newview/llviewerwindow.cpp | |
| parent | 8006203bdae4e78b4eeb54e715190ace58f43556 (diff) | |
Merge with tip
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -rwxr-xr-x | indra/newview/llviewerwindow.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index ca5523dfbd..c5cbc307ed 100755 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -4757,8 +4757,11 @@ 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(); |