From 8ff76e0a323a279a56fe87d606a455757a240462 Mon Sep 17 00:00:00 2001 From: minerjr Date: Fri, 21 Feb 2025 07:42:04 -0400 Subject: [PATCH] Revert "[FIRE-35081] - Added missing JIRA Tags to previous push." This reverts commit b749e2383d9f08479f5b87587d171d0ea86c7bf7. --- indra/llrender/llgltexture.cpp | 12 ++++++------ indra/llrender/llgltexture.h | 8 ++++---- indra/newview/lltextureview.cpp | 2 +- indra/newview/llviewerobject.cpp | 4 ++-- indra/newview/llviewertexture.cpp | 6 +++--- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/indra/llrender/llgltexture.cpp b/indra/llrender/llgltexture.cpp index f90dd791aa..7644779365 100644 --- a/indra/llrender/llgltexture.cpp +++ b/indra/llrender/llgltexture.cpp @@ -63,10 +63,10 @@ LLGLTexture::~LLGLTexture() void LLGLTexture::init() { mBoostLevel = LLGLTexture::BOOST_NONE; - // [FIRE-35081] Blurry prims not changing with graphics settings, not happening with SL Viewer + // // Added a previous boost level to allow for restorign boost after BOOST_SELECTED is applied mPrevBoostLevel = LLGLTexture::BOOST_NONE; - // [FIRE-35081] + // mFullWidth = 0; mFullHeight = 0; @@ -95,11 +95,11 @@ void LLGLTexture::dump() mGLTexturep->dump(); } } -// [FIRE-35081] Blurry prims not changing with graphics settings, not happening with SL Viewer +// //void LLGLTexture::setBoostLevel(S32 level) // Changed Changed from S32 to S8, to give up space and use the difference for a previous value void LLGLTexture::setBoostLevel(S8 level) -// [FIRE-35081] +// { if(mBoostLevel != level) { @@ -114,7 +114,7 @@ void LLGLTexture::setBoostLevel(S8 level) } } -// [FIRE-35081] Blurry prims not changing with graphics settings, not happening with SL Viewer +// // Changes the current boost level to the previous value void LLGLTexture::restoreBoostLevel() { @@ -125,7 +125,7 @@ void LLGLTexture::storeBoostLevel() { mPrevBoostLevel = mBoostLevel; } -// [FIRE-35081] +// void LLGLTexture::forceActive() { mTextureState = ACTIVE ; diff --git a/indra/llrender/llgltexture.h b/indra/llrender/llgltexture.h index 93c43846f4..c89a4a84e2 100644 --- a/indra/llrender/llgltexture.h +++ b/indra/llrender/llgltexture.h @@ -99,7 +99,7 @@ public: virtual const LLUUID& getID() const; - // [FIRE-35081] Blurry prims not changing with graphics settings, not happening with SL Viewer + // //void setBoostLevel(S32 level); //S32 getBoostLevel() { return mBoostLevel; } // Updated to fix issue with BOOST_SELECTION forceing textures to BOOST_NONE after de-selection @@ -107,7 +107,7 @@ public: void restoreBoostLevel(); // Now restores the mBoostLevel with the mPrevBoostLevel void storeBoostLevel(); // Stores the current mBoostLevel in mPrevBoostLevel S8 getBoostLevel() { return mBoostLevel; } - // [FIRE-35081] + // S32 getFullWidth() const { return mFullWidth; } S32 getFullHeight() const { return mFullHeight; } @@ -189,13 +189,13 @@ public: /*virtual*/ LLImageGL* getGLTexture() const ; protected: - // [FIRE-35081] Blurry prims not changing with graphics settings, not happening with SL Viewer + // //S32 mBoostLevel; // enum describing priority level // Modified to store the previous boost level, as well, boost only go up to 30, so a 32 bit int is a waste and the extra bits // can be used to store a previous value to allow for restoring the boost value after the BOOST_SELECTED is undone. S8 mBoostLevel; // enum describing priority level S8 mPrevBoostLevel; // enum describing priority level (Previous Value for BOOST_SELECTION restore) - // [FIRE-35081] + // U32 mFullWidth; U32 mFullHeight; bool mUseMipMaps; diff --git a/indra/newview/lltextureview.cpp b/indra/newview/lltextureview.cpp index 0d232a3f7e..359df125a3 100644 --- a/indra/newview/lltextureview.cpp +++ b/indra/newview/lltextureview.cpp @@ -726,7 +726,7 @@ void LLGLTexMemBar::draw() (S32)gTextureList.mCreateTextureList.size(), (S32)gTextureList.mFastCacheList.size()); // - // [FIRE-35081] + // x_right = 550.0f; LLFontGL::getFontMonospace()->renderUTF8(text, 0, 0.f, (F32)(v_offset + line_height*3), text_color, LLFontGL::LEFT, LLFontGL::TOP, diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index 2bff8cc1f7..baad001d0a 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -4199,7 +4199,7 @@ void LLViewerObject::boostTexturePriority(bool boost_children /* = true */) { getTEImage(i)->storeBoostLevel(); } - // [FIRE-35081] + // getTEImage(i)->setBoostLevel(LLGLTexture::BOOST_SELECTED); } @@ -4217,7 +4217,7 @@ void LLViewerObject::boostTexturePriority(bool boost_children /* = true */) sculptedTexture->storeBoostLevel(); } sculptedTexture->setBoostLevel(LLGLTexture::BOOST_SELECTED); - // [FIRE-35081] + // } if (boost_children) diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp index df3d654aa2..3791b7dc6d 100644 --- a/indra/newview/llviewertexture.cpp +++ b/indra/newview/llviewertexture.cpp @@ -718,7 +718,7 @@ void LLViewerTexture::init(bool firstinit) // [FIRE-35081] Blurry prims not changing with graphics settings, not happening with SL Viewer // Added default value fro the boost as it seemed that there were some instances boost was not being initalized. mBoostLevel = LLGLTexture::BOOST_NONE; - // [FIRE-35081] + // memset(&mNumVolumes, 0, sizeof(U32)* LLRender::NUM_VOLUME_TEXTURE_CHANNELS); mVolumeList[LLRender::LIGHT_TEX].clear(); mVolumeList[LLRender::SCULPT_TEX].clear(); @@ -1195,7 +1195,7 @@ void LLViewerFetchedTexture::init(bool firstinit) // [FIRE-35081] Blurry prims not changing with graphics settings, not happening with SL Viewer // Added default for boost level mBoostLevel = LLGLTexture::BOOST_NONE; - // [FIRE-35081] + // mFTType = FTT_UNKNOWN; } @@ -3031,7 +3031,7 @@ void LLViewerLODTexture::init(bool firstinit) // [FIRE-35081] Blurry prims not changing with graphics settings, not happening with SL Viewer // Added default value fro the boost as it seemed that there were some instances boost was not being initalized. mBoostLevel = LLGLTexture::BOOST_NONE; - // [FIRE-35081] + // } //virtual