diff options
| author | Michael Pohoreski <ptolemy@lindenlab.com> | 2022-01-14 20:23:22 +0000 |
|---|---|---|
| committer | Michael Pohoreski <ptolemy@lindenlab.com> | 2022-01-14 20:23:22 +0000 |
| commit | 7495af2ecc055a7ed620d5bb4a60e44a4e166513 (patch) | |
| tree | c5afdacdfdad70867c04bbdcadf1940478040262 /indra/newview/llviewerwindow.cpp | |
| parent | f8441963fc3dbbb35da220d6ae68447581a0db97 (diff) | |
| parent | 4edeca44da81bdb436c5bd549ed0c65921dde90e (diff) | |
Merged in SL-16606 (pull request #831)
SL-16606
Approved-by: Euclid Linden
Approved-by: Dave Parks
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 8d749c41cc..2fc4e9d0bd 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -3333,7 +3333,7 @@ static LLTrace::BlockTimerStatHandle ftm("Update UI"); // event processing. void LLViewerWindow::updateUI() { - LL_RECORD_BLOCK_TIME(ftm); + LL_PROFILE_ZONE_SCOPED_CATEGORY_UI; //LL_RECORD_BLOCK_TIME(ftm); static std::string last_handle_msg; @@ -5384,7 +5384,7 @@ void LLViewerWindow::setup3DRender() void LLViewerWindow::setup3DViewport(S32 x_offset, S32 y_offset) { - LL_PROFILE_ZONE_SCOPED + LL_PROFILE_ZONE_SCOPED_CATEGORY_UI gGLViewport[0] = mWorldViewRectRaw.mLeft + x_offset; gGLViewport[1] = mWorldViewRectRaw.mBottom + y_offset; gGLViewport[2] = mWorldViewRectRaw.getWidth(); |