diff options
author | Dave Houlton <euclid@lindenlab.com> | 2020-09-29 22:46:43 +0000 |
---|---|---|
committer | Dave Houlton <euclid@lindenlab.com> | 2020-09-29 22:46:43 +0000 |
commit | 18ddd70d96dc572ad94c81f9a1a3d08d7c7cdbc7 (patch) | |
tree | 529ce1546477d9620c18095ab73e54bbd7ea8d90 /indra/newview/lldrawpoolterrain.cpp | |
parent | 7781e1417e5a747a501e76ee9e976226a2656b6a (diff) | |
parent | eb6c8c937e214f58cc4da48bd4db455315de4c20 (diff) |
Merged in DV510-merge-6.4.10 (pull request #322)
Merge master v 6.4.10 to DRTVWR-510
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) |