LLWindow V3 partial merge. Includes Most everything sans new LLMouseHandler which requires some messy changes in llviewerwindow that are best left for a dedicated commit. Also, some translation fluff was skipped for now.
This commit is contained in:
@@ -34,6 +34,7 @@
|
||||
|
||||
#include "lldynamictexture.h"
|
||||
#include "llglheaders.h"
|
||||
#include "llwindow.h" // getPosition()
|
||||
#include "llviewerwindow.h"
|
||||
#include "llviewercamera.h"
|
||||
#include "llviewercontrol.h"
|
||||
@@ -55,6 +56,13 @@ LLViewerDynamicTexture::LLViewerDynamicTexture(S32 width, S32 height, S32 compon
|
||||
{
|
||||
llassert((1 <= components) && (components <= 4));
|
||||
|
||||
if(gGLManager.mDebugGPU)
|
||||
{
|
||||
if(components == 3)
|
||||
{
|
||||
mComponents = 4 ; //convert to 32bits.
|
||||
}
|
||||
}
|
||||
generateGLTexture();
|
||||
|
||||
llassert( 0 <= order && order < ORDER_COUNT );
|
||||
|
||||
Reference in New Issue
Block a user