diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-05-26 06:15:49 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-05-26 06:15:49 +0300 |
| commit | b9cd6e2e84f9c4161f0151b9f0cee1fcb309d8d7 (patch) | |
| tree | d92a175355a53fc03d1f50a9aa4eca71787a027c /indra/newview/lltextureview.cpp | |
| parent | 74b8ca575ff7f0cfcfd443e03885542bc5b10c46 (diff) | |
| parent | 626bbe5032cab1fd2641ad02443e421567e7cce5 (diff) | |
Merge branch 'xcode-14.3' into DRTVWR-582-maint-U
# Conflicts:
# indra/llcommon/llsdserialize.h
Diffstat (limited to 'indra/newview/lltextureview.cpp')
| -rw-r--r-- | indra/newview/lltextureview.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lltextureview.cpp b/indra/newview/lltextureview.cpp index cf9211767e..84b61fc612 100644 --- a/indra/newview/lltextureview.cpp +++ b/indra/newview/lltextureview.cpp @@ -845,8 +845,8 @@ void LLTextureView::draw() if (imagep->getID() == LLAppViewer::getTextureFetch()->mDebugID) { - static S32 debug_count = 0; - ++debug_count; // for breakpoints +// static S32 debug_count = 0; +// ++debug_count; // for breakpoints } F32 pri; |