summaryrefslogtreecommitdiff
path: root/indra/llrender
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2010-12-10 20:42:29 -0600
committerDave Parks <davep@lindenlab.com>2010-12-10 20:42:29 -0600
commit6f8ff871cdd0402d07800444f0524079fe02fac6 (patch)
tree071fc033d8b721934650e79584cd415d3da501bb /indra/llrender
parent285ba513368c6b692ea2eb5d13b85300c76adbea (diff)
parent8e5f15a3b64e1e7cd14c8c4c9535299b93f3496b (diff)
merge
Diffstat (limited to 'indra/llrender')
-rw-r--r--indra/llrender/llvertexbuffer.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llrender/llvertexbuffer.h b/indra/llrender/llvertexbuffer.h
index 953b7e6757..f40f013306 100644
--- a/indra/llrender/llvertexbuffer.h
+++ b/indra/llrender/llvertexbuffer.h
@@ -198,7 +198,7 @@ public:
U8* getIndicesPointer() const { return useVBOs() ? (U8*) mAlignedIndexOffset : mMappedIndexData; }
U8* getVerticesPointer() const { return useVBOs() ? (U8*) mAlignedOffset : mMappedData; }
U32 getTypeMask() const { return mTypeMask; }
- BOOL hasDataType(S32 type) const { return ((1 << type) & getTypeMask()) ? TRUE : FALSE; }
+ bool hasDataType(S32 type) const { return ((1 << type) & getTypeMask()); }
S32 getSize() const;
S32 getIndicesSize() const { return mNumIndices * sizeof(U16); }
U8* getMappedData() const { return mMappedData; }