viewer#2411 Cleanup #2

3 files changed, 5 insertions, 14 deletions

diff --git a/indra/llrender/llrender.cpp b/indra/llrender/llrender.cpp
index a40a668a70..828a509971 100644
--- a/indra/llrender/llrender.cpp
+++ b/indra/llrender/llrender.cpp
@@ -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
     }
 }
 
diff --git a/indra/llui/llbutton.cpp b/indra/llui/llbutton.cpp
index 387d2c0d07..1bce31edb1 100644
--- a/indra/llui/llbutton.cpp
+++ b/indra/llui/llbutton.cpp
@@ -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();
diff --git a/indra/llui/llbutton.h b/indra/llui/llbutton.h
index 6a389f0554..890e7c2d1e 100644
--- a/indra/llui/llbutton.h
+++ b/indra/llui/llbutton.h
@@ -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;