diff options
author | Callum Prentice <callum@gmail.com> | 2020-09-28 15:56:44 -0700 |
---|---|---|
committer | Callum Prentice <callum@gmail.com> | 2020-09-28 15:56:44 -0700 |
commit | 354930014bc90a9c92b33300e5ecaf7fa861fe7b (patch) | |
tree | b8ba1be3ae740aaa0db8ca7d639c78ce35c5918d /indra/newview/lldrawpoolterrain.cpp | |
parent | 6be1f88a5ef99e1e40bb5701a250ba0728f56005 (diff) | |
parent | bac6652cdcd2d8333df04c3ebd3a6a7b752328b3 (diff) |
Merge with tip of Release
Diffstat (limited to 'indra/newview/lldrawpoolterrain.cpp')
-rw-r--r-- | indra/newview/lldrawpoolterrain.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/indra/newview/lldrawpoolterrain.cpp b/indra/newview/lldrawpoolterrain.cpp index 33a11631fe..37dc80e2b7 100644 --- a/indra/newview/lldrawpoolterrain.cpp +++ b/indra/newview/lldrawpoolterrain.cpp @@ -87,13 +87,6 @@ LLDrawPoolTerrain::~LLDrawPoolTerrain() llassert( gPipeline.findPool( getType(), getTexture() ) == NULL ); } - -LLDrawPool *LLDrawPoolTerrain::instancePool() -{ - return new LLDrawPoolTerrain(mTexturep); -} - - U32 LLDrawPoolTerrain::getVertexDataMask() { if (LLPipeline::sShadowRender) |