Revert "[FIRE-35081] - Added missing JIRA Tags to previous push."

This reverts commit b749e2383d.
master
minerjr 2025-02-21 07:42:04 -04:00
parent b749e2383d
commit 8ff76e0a32
5 changed files with 16 additions and 16 deletions

View File

@ -63,10 +63,10 @@ LLGLTexture::~LLGLTexture()
void LLGLTexture::init()
{
mBoostLevel = LLGLTexture::BOOST_NONE;
// <FS:minerjr> [FIRE-35081] Blurry prims not changing with graphics settings, not happening with SL Viewer
// <FS:minerjr>
// Added a previous boost level to allow for restorign boost after BOOST_SELECTED is applied
mPrevBoostLevel = LLGLTexture::BOOST_NONE;
// </FS:minerjr> [FIRE-35081]
// </FS:minerjr>
mFullWidth = 0;
mFullHeight = 0;
@ -95,11 +95,11 @@ void LLGLTexture::dump()
mGLTexturep->dump();
}
}
// <FS:minerjr> [FIRE-35081] Blurry prims not changing with graphics settings, not happening with SL Viewer
// <FS:minerjr>
//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)
// </FS:minerjr> [FIRE-35081]
// </FS:minerjr>
{
if(mBoostLevel != level)
{
@ -114,7 +114,7 @@ void LLGLTexture::setBoostLevel(S8 level)
}
}
// <FS:minerjr> [FIRE-35081] Blurry prims not changing with graphics settings, not happening with SL Viewer
// <FS:minerjr>
// Changes the current boost level to the previous value
void LLGLTexture::restoreBoostLevel()
{
@ -125,7 +125,7 @@ void LLGLTexture::storeBoostLevel()
{
mPrevBoostLevel = mBoostLevel;
}
// </FS:minerjr> [FIRE-35081]
// </FS:minerjr>
void LLGLTexture::forceActive()
{
mTextureState = ACTIVE ;

View File

@ -99,7 +99,7 @@ public:
virtual const LLUUID& getID() const;
// <FS:minerjr> [FIRE-35081] Blurry prims not changing with graphics settings, not happening with SL Viewer
// <FS:minerjr>
//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; }
// </FS:minerjr> [FIRE-35081]
// </FS:minerjr>
S32 getFullWidth() const { return mFullWidth; }
S32 getFullHeight() const { return mFullHeight; }
@ -189,13 +189,13 @@ public:
/*virtual*/ LLImageGL* getGLTexture() const ;
protected:
// <FS:minerjr> [FIRE-35081] Blurry prims not changing with graphics settings, not happening with SL Viewer
// <FS:minerjr>
//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)
// </FS:minerjr> [FIRE-35081]
// </FS:minerjr>
U32 mFullWidth;
U32 mFullHeight;
bool mUseMipMaps;

View File

@ -726,7 +726,7 @@ void LLGLTexMemBar::draw()
(S32)gTextureList.mCreateTextureList.size(),
(S32)gTextureList.mFastCacheList.size());
// </FS:Ansariel>
// </FS:minerjr> [FIRE-35081]
// </FS:minerjr>
x_right = 550.0f;
LLFontGL::getFontMonospace()->renderUTF8(text, 0, 0.f, (F32)(v_offset + line_height*3),
text_color, LLFontGL::LEFT, LLFontGL::TOP,

View File

@ -4199,7 +4199,7 @@ void LLViewerObject::boostTexturePriority(bool boost_children /* = true */)
{
getTEImage(i)->storeBoostLevel();
}
// </FS:minerjr> [FIRE-35081]
// </FS:minerjr>
getTEImage(i)->setBoostLevel(LLGLTexture::BOOST_SELECTED);
}
@ -4217,7 +4217,7 @@ void LLViewerObject::boostTexturePriority(bool boost_children /* = true */)
sculptedTexture->storeBoostLevel();
}
sculptedTexture->setBoostLevel(LLGLTexture::BOOST_SELECTED);
// </FS:minerjr> [FIRE-35081]
// </FS:minerjr>
}
if (boost_children)

View File

@ -718,7 +718,7 @@ void LLViewerTexture::init(bool firstinit)
// <FS:minerjr> [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;
// </FS:minerjr> [FIRE-35081]
// </FS:minerjr>
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)
// <FS:minerjr> [FIRE-35081] Blurry prims not changing with graphics settings, not happening with SL Viewer
// Added default for boost level
mBoostLevel = LLGLTexture::BOOST_NONE;
// </FS:minerjr> [FIRE-35081]
// </FS:minerjr>
mFTType = FTT_UNKNOWN;
}
@ -3031,7 +3031,7 @@ void LLViewerLODTexture::init(bool firstinit)
// <FS:minerjr> [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;
// </FS:minerjr> [FIRE-35081]
// </FS:minerjr>
}
//virtual