livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

viewer#2411 Cleanup #2

master
Andrey Kleshchev 2024-09-03 17:22:04 +03:00 committed by Andrey Kleshchev
parent 4cc0edb189
commit 2fc8d5ff3c
3 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/llrender/llrender.cpp
View File

@ -1531,6 +1531,10 @@ void LLRender::clearErrors()
void LLRender::beginList(std::list<LLVertexBufferData> *list)
{
if (sBufferDataList)
{
LL_ERRS() << "beginList called while another list is open." << LL_ENDL;
}
llassert(LLGLSLShader::sCurBoundShaderPtr == &gUIProgram);
flush();
sBufferDataList = list;
@ -1545,7 +1549,7 @@ void LLRender::endList()
}
else
{
llassert(false); // something failed to provide a list or closed it twice
llassert(false); // endList called without an open list
}
}

12
indra/llui/llbutton.cpp
View File

@ -427,18 +427,6 @@ void LLButton::onVisibilityChange(bool new_visibility)
return LLUICtrl::onVisibilityChange(new_visibility);
}
void LLButton::reshape(S32 width, S32 height, bool called_from_parent)
{
S32 delta_width = width - getRect().getWidth();
S32 delta_height = height - getRect().getHeight();
if (delta_width || delta_height || sForceReshape)
{
LLUICtrl::reshape(width, height, called_from_parent);
mFontBuffer.reset();
}
}
void LLButton::dirtyRect()
{
LLUICtrl::dirtyRect();

1
indra/llui/llbutton.h
View File

@ -169,7 +169,6 @@ public:
/*virtual*/ bool postBuild() override;
void onVisibilityChange(bool visible) override;
void reshape(S32 width, S32 height, bool called_from_parent = true) override;
void dirtyRect() override;
virtual void onMouseLeave(S32 x, S32 y, MASK mask) override;