summaryrefslogtreecommitdiff
path: root/indra/llappearance
diff options
context:
space:
mode:
authorprep <prep@lindenlab.com>2013-03-11 15:05:47 -0400
committerprep <prep@lindenlab.com>2013-03-11 15:05:47 -0400
commite0c9174609e2457fab7fe6d7291c6ebbd030397c (patch)
treea6f43767b2c3254e501c4ce0af628dfd159ad600 /indra/llappearance
parent9514210beb1ae2ec49f1cf15e5a4f7af5ae56657 (diff)
parent207d9fd767895a3470722fb298eeef4f338e479a (diff)
merge
Diffstat (limited to 'indra/llappearance')
-rw-r--r--indra/llappearance/lltexlayer.cpp3
-rwxr-xr-xindra/llappearance/lltexlayerparams.cpp3
2 files changed, 4 insertions, 2 deletions
diff --git a/indra/llappearance/lltexlayer.cpp b/indra/llappearance/lltexlayer.cpp
index 3c23f5f293..c075035226 100644
--- a/indra/llappearance/lltexlayer.cpp
+++ b/indra/llappearance/lltexlayer.cpp
@@ -38,7 +38,8 @@
#include "llvfs.h"
#include "lltexlayerparams.h"
#include "lltexturemanagerbridge.h"
-#include "llrender2dutils.h"
+//#include "llrender2dutils.h"
+#include "..\llui\llui.h"
#include "llwearable.h"
#include "llwearabledata.h"
#include "llvertexbuffer.h"
diff --git a/indra/llappearance/lltexlayerparams.cpp b/indra/llappearance/lltexlayerparams.cpp
index 64b3b62185..1adc294705 100755
--- a/indra/llappearance/lltexlayerparams.cpp
+++ b/indra/llappearance/lltexlayerparams.cpp
@@ -33,7 +33,8 @@
#include "llquantize.h"
#include "lltexlayer.h"
#include "lltexturemanagerbridge.h"
-#include "llrender2dutils.h"
+//#include "llrender2dutils.h"
+#include "..\llui\llui.h"
#include "llwearable.h"
//-----------------------------------------------------------------------------