summaryrefslogtreecommitdiff
path: root/indra/newview/llmimetypes.cpp
diff options
context:
space:
mode:
authornat-goodspeed <nat@lindenlab.com>2024-09-05 08:37:16 -0400
committerGitHub <noreply@github.com>2024-09-05 08:37:16 -0400
commit7ac4c3b56e5246fceaa73e7c9c665d3c04827d6c (patch)
treee96334bd9299102ebdaf229eec9cf4c2165f8c2f /indra/newview/llmimetypes.cpp
parent487973d3f0ee9b8583b3d977ca6a405cba5fe518 (diff)
parent6a747e1ce027700a3609f4c377179bfa29c3ce31 (diff)
Merge pull request #2450 from secondlife/lua-merge
Merge updated 'main' branch into release/luau-scripting
Diffstat (limited to 'indra/newview/llmimetypes.cpp')
-rw-r--r--indra/newview/llmimetypes.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llmimetypes.cpp b/indra/newview/llmimetypes.cpp
index 33d7ec2fc0..ee10b38a9d 100644
--- a/indra/newview/llmimetypes.cpp
+++ b/indra/newview/llmimetypes.cpp
@@ -131,15 +131,15 @@ bool LLMIMETypes::parseMIMETypes(const std::string& xml_filename)
}
if (child->hasName("allow_resize"))
{
- BOOL allow_resize = FALSE;
+ bool allow_resize = false;
child->getBoolValue( 1, &allow_resize );
- info.mAllowResize = (bool)allow_resize;
+ info.mAllowResize = allow_resize;
}
if (child->hasName("allow_looping"))
{
- BOOL allow_looping = FALSE;
+ bool allow_looping = false;
child->getBoolValue( 1, &allow_looping );
- info.mAllowLooping = (bool)allow_looping;
+ info.mAllowLooping = allow_looping;
}
}
sWidgetMap[set_name] = info;