diff options
author | RunitaiLinden <davep@lindenlab.com> | 2023-05-17 13:41:05 -0500 |
---|---|---|
committer | RunitaiLinden <davep@lindenlab.com> | 2023-05-17 13:41:05 -0500 |
commit | a2e418f250c49de9aba943a62f92189fcef6220a (patch) | |
tree | 3993a02eff77b05f280f6e474c3c68dab624a3b1 /indra/llcommon/lltrace.cpp | |
parent | 6f5f16e0319bde183534a779839299dca7fe50ab (diff) | |
parent | 2f44377b3e98d60f1bd5b1a495c9a3aab9cfa450 (diff) |
Merge branch 'DRTVWR-559' of github.com:secondlife/viewer into DRTVWR-559
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) |