diff options
| author | Kitty Barnett <develop@catznip.com> | 2023-02-08 14:52:16 +0100 |
|---|---|---|
| committer | Kitty Barnett <develop@catznip.com> | 2023-02-08 14:52:16 +0100 |
| commit | 5805bbd8104e66fb9ae7ed3c22e374e377b2f2e1 (patch) | |
| tree | aeea23255f4717f57012d5d42075659ecff6c76a /indra/llcommon/lltrace.cpp | |
| parent | da0335c864477036ba996fbab4db2194535466d7 (diff) | |
| parent | b2f890408e2dc63a0f842273c41c0efed770cb9a (diff) | |
Merge branch 'DRTVWR-489-emoji' of https://github.com/secondlife/viewer 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) |