summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerwindow.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2012-06-13 18:06:49 -0500
committerDave Parks <davep@lindenlab.com>2012-06-13 18:06:49 -0500
commit9605da154efc0b4913bc68082b8876b660d205b1 (patch)
treeda58722a5ef1d3e02a849d5ce986eb22a968d41f /indra/newview/llviewerwindow.cpp
parentc559e3d6b93216496065cd05dd2734b726d61201 (diff)
parentb93a23aa828a2ee6de206fe3c74d1b0f3e116db1 (diff)
merge
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 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();