diff options
| author | Brad Linden <brad@lindenlab.com> | 2022-12-13 11:39:54 -0800 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2022-12-13 11:39:54 -0800 |
| commit | a4397723b7ed1e5a8c86b104fd5a8b94da03abb9 (patch) | |
| tree | 5c3a0a6ffb521306442f98cbda0ff05284f7a220 /indra/newview/lldrawpoolwater.cpp | |
| parent | 43c0dc7f15a013405ce8172e1fbd390c771a1967 (diff) | |
| parent | 0c2e7a8eb70193b083a055dacbfde67239a8ff07 (diff) | |
Merge remote-tracking branch 'origin/DRTVWR-559' into brad/DRTVWR-559
Diffstat (limited to 'indra/newview/lldrawpoolwater.cpp')
| -rw-r--r-- | indra/newview/lldrawpoolwater.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lldrawpoolwater.cpp b/indra/newview/lldrawpoolwater.cpp index bc42dab1f2..77da29061d 100644 --- a/indra/newview/lldrawpoolwater.cpp +++ b/indra/newview/lldrawpoolwater.cpp @@ -743,7 +743,7 @@ void LLDrawPoolWater::renderWater() LLViewerTexture *LLDrawPoolWater::getDebugTexture() { - return LLViewerFetchedTexture::sSmokeImagep; + return LLViewerTextureManager::getFetchedTexture(IMG_SMOKE); } LLColor3 LLDrawPoolWater::getDebugColor() const |