summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerwindow.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2012-07-24 10:51:37 -0400
committerOz Linden <oz@lindenlab.com>2012-07-24 10:51:37 -0400
commit8df36196215131cbac961f47bfbd4a1b925548cb (patch)
tree35fe890f1f2e47c9acd0d411925897ee7e3794d6 /indra/newview/llviewerwindow.cpp
parent4feef5af63f6294249aa50e37fba712cd9ddec91 (diff)
parentd7015a2b9b55907c8447d0051cf5d7ac862aebf7 (diff)
merge to viewer-developmento
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
-rw-r--r--indra/newview/llviewerwindow.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 30bb787fa7..af2eec9ba8 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -4768,8 +4768,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();