diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2020-09-28 19:51:24 +0100 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2020-09-28 19:51:24 +0100 |
commit | 376f690f8fb9253f33bc207dce6e533dff9c8687 (patch) | |
tree | 9b5077efe190e91f0c2a309038dca2e48664582c /indra/newview/lldrawpooltree.h | |
parent | 1cba874abf6f955cf52d68c30c3230ec58528057 (diff) | |
parent | bac6652cdcd2d8333df04c3ebd3a6a7b752328b3 (diff) |
Merge remote-tracking branch 'origin/master' into DRTVWR-517
Diffstat (limited to 'indra/newview/lldrawpooltree.h')
-rw-r--r-- | indra/newview/lldrawpooltree.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/newview/lldrawpooltree.h b/indra/newview/lldrawpooltree.h index 9c1e60f5eb..13f9ec8dce 100644 --- a/indra/newview/lldrawpooltree.h +++ b/indra/newview/lldrawpooltree.h @@ -45,8 +45,6 @@ public: LLDrawPoolTree(LLViewerTexture *texturep); - /*virtual*/ LLDrawPool *instancePool(); - /*virtual*/ void prerender(); /*virtual*/ S32 getNumDeferredPasses() { return 1; } |