summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerwindow.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2012-07-13 13:04:16 -0400
committerOz Linden <oz@lindenlab.com>2012-07-13 13:04:16 -0400
commitc3d9f0e41cc0cde6f1383225a8937d128e5838d8 (patch)
tree24d60b5329c102c672ccd55e31527a1f304eca6a /indra/newview/llviewerwindow.cpp
parent254c2703632ef5d7a875597d4907804c63ed8e72 (diff)
parente51a60536dc082be563c2f5b3b4f86df843d3a14 (diff)
merge changes for DRTVWR-179
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
-rwxr-xr-xindra/newview/llviewerwindow.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 7afb135470..0de867388c 100755
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -4760,8 +4760,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();