diff options
| author | Callum Prentice <callum@mbp.localdomain> | 2023-01-26 10:37:59 -0800 |
|---|---|---|
| committer | Callum Prentice <callum@mbp.localdomain> | 2023-01-26 10:37:59 -0800 |
| commit | fb00bce81ad201b5f1798ff5d5afe8c4dcabda54 (patch) | |
| tree | a157a9f0ec2648cf7d2281a8019b52b8468111f9 /indra/llcommon/lltrace.cpp | |
| parent | 66f59478d09122ddf43c4ba3445754d1698bf016 (diff) | |
| parent | f3cd329b585ef55a66f2a824f010d1a54d67d8d2 (diff) | |
Merge branch 'xcode-14.1' into DRTVWR-489-emoji
Diffstat (limited to 'indra/llcommon/lltrace.cpp')
| -rw-r--r-- | indra/llcommon/lltrace.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/lltrace.cpp b/indra/llcommon/lltrace.cpp index acdda5fe1e..ff671a8370 100644 --- a/indra/llcommon/lltrace.cpp +++ b/indra/llcommon/lltrace.cpp @@ -65,7 +65,7 @@ void TimeBlockTreeNode::setParent( BlockTimerStatHandle* parent ) llassert_always(parent != mBlock); llassert_always(parent != NULL); - TimeBlockTreeNode* parent_tree_node = get_thread_recorder()->getTimeBlockTreeNode(parent->getIndex()); + TimeBlockTreeNode* parent_tree_node = get_thread_recorder()->getTimeBlockTreeNode(narrow(parent->getIndex())); if (!parent_tree_node) return; if (mParent) |