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/lldrawpoolwater.cpp | |
| parent | 6be1f88a5ef99e1e40bb5701a250ba0728f56005 (diff) | |
| parent | bac6652cdcd2d8333df04c3ebd3a6a7b752328b3 (diff) | |
Merge with tip of Release
Diffstat (limited to 'indra/newview/lldrawpoolwater.cpp')
| -rw-r--r-- | indra/newview/lldrawpoolwater.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/indra/newview/lldrawpoolwater.cpp b/indra/newview/lldrawpoolwater.cpp index 073adfb627..7249f22555 100644 --- a/indra/newview/lldrawpoolwater.cpp +++ b/indra/newview/lldrawpoolwater.cpp @@ -104,13 +104,6 @@ void LLDrawPoolWater::restoreGL() }*/ } -LLDrawPool *LLDrawPoolWater::instancePool() -{ - LL_ERRS() << "Should never be calling instancePool on a water pool!" << LL_ENDL; - return NULL; -} - - void LLDrawPoolWater::prerender() { mShaderLevel = (gGLManager.mHasCubeMap && LLCubeMap::sUseCubeMaps) ? LLViewerShaderMgr::instance()->getShaderLevel(LLViewerShaderMgr::SHADER_WATER) : 0; |