UI cleanup.
-Added ui-local transformation matrix. -Gutted legacy commitcallbacks throughout ui widget ctors. -Created filter_editor ui widget which issues commit on keypress -search_editor commits on focus loss/enter press -search_editor and filter_editor now have a built in 'x' button to clear text. -LLComboBox::setPrearrangeCallback now uses boost::function -LLComboBox::setTextEntryCallback now uses boost::function -LLLineEditor::setKeystrokeCallback now uses boost::function -LLLineEditor::setPrevalidate now uses boost::function -LLPanel::childSetKeystrokeCallback removed -LLPanel::childSetPrevalidate removed -LLPanel::childSetActionTextbox now uses boost::function -LLTextBox::setClickedCallback now uses boost::function -LLTextEditor::setKeystrokeCallback added. -Cleaned up JCFloaterAreaSearch
This commit is contained in:
@@ -81,7 +81,6 @@
|
||||
|
||||
// newview includes
|
||||
#include "llagent.h"
|
||||
#include "llalertdialog.h"
|
||||
#include "llbox.h"
|
||||
#include "llchatbar.h"
|
||||
#include "llconsole.h"
|
||||
@@ -2359,16 +2358,19 @@ void LLViewerWindow::drawDebugText()
|
||||
{
|
||||
gGL.color4f(1,1,1,1);
|
||||
gGL.pushMatrix();
|
||||
gGL.pushUIMatrix();
|
||||
if (LLGLSLShader::sNoFixedFunction)
|
||||
{
|
||||
gUIProgram.bind();
|
||||
}
|
||||
{
|
||||
// scale view by UI global scale factor and aspect ratio correction factor
|
||||
gGL.scalef(mDisplayScale.mV[VX], mDisplayScale.mV[VY], 1.f);
|
||||
gGL.scaleUI(mDisplayScale.mV[VX], mDisplayScale.mV[VY], 1.f);
|
||||
mDebugText->draw();
|
||||
}
|
||||
gGL.popUIMatrix();
|
||||
gGL.popMatrix();
|
||||
|
||||
gGL.flush();
|
||||
if (LLGLSLShader::sNoFixedFunction)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user