diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2022-12-12 13:27:57 -0500 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2022-12-12 13:27:57 -0500 |
commit | 12f66fda1376a03a0ef791d22984bd4a13831b5a (patch) | |
tree | fb1778164030ffdcf84fafb464b80a3845f12500 /indra/llcommon/lltrace.cpp | |
parent | 6de598633355d8867f4de483ab7e2f37a78679c4 (diff) | |
parent | 2b7ba3f90455d675770e68f7e338d39053a343b9 (diff) |
DRTVWR-565: Merge branch 'origin/contribute' into DRTVWR-565
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) |