summaryrefslogtreecommitdiff
path: root/indra/newview/lldynamictexture.cpp
diff options
context:
space:
mode:
authorAnsariel <ansariel.hiller@phoenixviewer.com>2024-05-10 15:16:06 +0200
committerAnsariel <ansariel.hiller@phoenixviewer.com>2024-05-10 15:16:06 +0200
commit799ebf21624edb8b42ca16b8cf51c138643efd32 (patch)
tree438df7d344821c75c65625353198542103b18f9f /indra/newview/lldynamictexture.cpp
parent155ddf23363f1d5c534c69f50505faf67e51948f (diff)
Fix broken merge and BOOL/bool issues
Diffstat (limited to 'indra/newview/lldynamictexture.cpp')
-rw-r--r--indra/newview/lldynamictexture.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lldynamictexture.cpp b/indra/newview/lldynamictexture.cpp
index 744c55d64a..407256bea2 100644
--- a/indra/newview/lldynamictexture.cpp
+++ b/indra/newview/lldynamictexture.cpp
@@ -196,7 +196,7 @@ bool LLViewerDynamicTexture::updateAllInstances()
if (!bake_target.isComplete())
{
llassert(false);
- return FALSE;
+ return false;
}
llassert(bake_target.getWidth() >= LLPipeline::MAX_BAKE_WIDTH);
llassert(bake_target.getHeight() >= LLPipeline::MAX_BAKE_WIDTH);