diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2020-11-11 15:43:06 -0700 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2020-11-11 15:43:06 -0700 |
| commit | 21e2f3e974cfe8e337a7dae7dc26e68fb3c2c4ba (patch) | |
| tree | c174e7cc65e82e3efd7d119e5644162187369c04 /indra/newview/llvovolume.cpp | |
| parent | f9a09406b38ad62e1db5914a96e462002c80fce9 (diff) | |
| parent | 04c473ab46041133ea6a87dbe0d43e662472adf5 (diff) | |
Merge branch 'master' 6.4.12 into DRTVWR-510
Diffstat (limited to 'indra/newview/llvovolume.cpp')
| -rw-r--r-- | indra/newview/llvovolume.cpp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index ef39faa814..492d37edba 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() @@ -1391,6 +1392,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; } } |