diff options
| author | Brad Linden <46733234+brad-linden@users.noreply.github.com> | 2024-06-12 14:33:01 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-12 14:33:01 -0700 |
| commit | 071e464155a670a9a7e836ec52049fc80b507995 (patch) | |
| tree | e129794d3f4c29c92d6515cbdbe6898ee8aa558b /indra/llxml | |
| parent | f0de2ba6340e0d540aa70ac0086defde52cf60af (diff) | |
| parent | 8444cd9562a6a7b755fcb075864e205122354192 (diff) | |
Merge pull request #1723 from secondlife/brad/maint-a-merge-to-gltf-dev
maint a merge to gltf dev
Diffstat (limited to 'indra/llxml')
| -rw-r--r-- | indra/llxml/llxmlnode.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llxml/llxmlnode.cpp b/indra/llxml/llxmlnode.cpp index 5e98af8412..0fd4516844 100644 --- a/indra/llxml/llxmlnode.cpp +++ b/indra/llxml/llxmlnode.cpp @@ -670,7 +670,7 @@ bool LLXMLNode::parseFile(const std::string& filename, LLXMLNodePtr& node, LLXML buffer[nread] = 0; fclose(fp); - bool rv = parseBuffer(buffer, nread, node, defaults_tree); + bool rv = parseBuffer(buffer, static_cast<U32>(nread), node, defaults_tree); delete [] buffer; return rv; } @@ -2681,7 +2681,7 @@ U32 LLXMLNode::getChildCount() const { if (mChildren.notNull()) { - return mChildren->map.size(); + return static_cast<U32>(mChildren->map.size()); } return 0; } @@ -2700,7 +2700,7 @@ LLXMLNode *get_rand_node(LLXMLNode *node) { if (node->mChildren.notNull()) { - U32 num_children = node->mChildren->map.size(); + U32 num_children = static_cast<U32>(node->mChildren->map.size()); if (get_rand(2) == 0) { while (true) |