summaryrefslogtreecommitdiff
path: root/indra/newview/llviewertexture.h
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2013-06-20 12:10:26 -0500
committerDave Parks <davep@lindenlab.com>2013-06-20 12:10:26 -0500
commit9ea2d90a0dd9ca9ab76583187354533011ef3fcb (patch)
tree93be8f1dd703cd87083cf871c1948671e0a8cb97 /indra/newview/llviewertexture.h
parent2655c7a17ae38a073dcf8f05b0127b68edc34c95 (diff)
parentf62d04d4256e3ebb7ecf64ea370099c8795e8581 (diff)
Automated merge with http://bitbucket.org/lindenlab/viewer-release
Diffstat (limited to 'indra/newview/llviewertexture.h')
-rwxr-xr-xindra/newview/llviewertexture.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llviewertexture.h b/indra/newview/llviewertexture.h
index c96f89017f..10101a4b9b 100755
--- a/indra/newview/llviewertexture.h
+++ b/indra/newview/llviewertexture.h
@@ -101,6 +101,7 @@ public:
INVALID_TEXTURE_TYPE
};
+
typedef std::vector<LLFace*> ll_face_list_t;
typedef std::vector<LLVOVolume*> ll_volume_list_t;