From 7faec04ea6b1f2c3184de8c10c6da85ceb57a181 Mon Sep 17 00:00:00 2001
From: Mnikolenko Productengine <mnikolenko@productengine.com>
Date: Fri, 22 May 2020 18:53:48 +0300
Subject: [PATCH] SL-13286 FIXED Turning off the DebugObjectLODs debug setting
doesn't clear text
---
indra/newview/llvovolume.cpp | 12 +++++++++++-
indra/newview/llvovolume.h | 2 ++
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index 2ffd462ac3c..113a01777e2 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -235,7 +235,8 @@ LLVOVolume::LLVOVolume(const LLUUID &id, const LLPCode pcode, LLViewerRegion *re
mLastFetchedMediaVersion = -1;
memset(&mIndexInTex, 0, sizeof(S32) * LLRender::NUM_VOLUME_TEXTURE_CHANNELS);
mMDCImplCount = 0;
- mLastRiggingInfoLOD = -1;
+ mLastRiggingInfoLOD = -1;
+ mResetDebugText = false;
}
LLVOVolume::~LLVOVolume()
@@ -1388,6 +1389,15 @@ BOOL LLVOVolume::calcLOD()
{
std::string debug_object_text = get_debug_object_lod_text(this);
setDebugText(debug_object_text);
+ mResetDebugText = true;
+ }
+ }
+ else
+ {
+ if (mResetDebugText)
+ {
+ restoreHudText();
+ mResetDebugText = false;
}
}
diff --git a/indra/newview/llvovolume.h b/indra/newview/llvovolume.h
index de00ef494e6..ce400a34986 100644
--- a/indra/newview/llvovolume.h
+++ b/indra/newview/llvovolume.h
@@ -424,6 +424,8 @@ class LLVOVolume : public LLViewerObject
S32 mIndexInTex[LLRender::NUM_VOLUME_TEXTURE_CHANNELS];
S32 mMDCImplCount;
+ bool mResetDebugText;
+
LLPointer<LLRiggedVolume> mRiggedVolume;
// statics
--
GitLab