summaryrefslogtreecommitdiff
path: root/indra/newview/llagentpicksinfo.cpp
diff options
context:
space:
mode:
authorBrad Linden <46733234+brad-linden@users.noreply.github.com>2024-06-12 14:33:01 -0700
committerGitHub <noreply@github.com>2024-06-12 14:33:01 -0700
commit071e464155a670a9a7e836ec52049fc80b507995 (patch)
treee129794d3f4c29c92d6515cbdbe6898ee8aa558b /indra/newview/llagentpicksinfo.cpp
parentf0de2ba6340e0d540aa70ac0086defde52cf60af (diff)
parent8444cd9562a6a7b755fcb075864e205122354192 (diff)
Merge pull request #1723 from secondlife/brad/maint-a-merge-to-gltf-dev
maint a merge to gltf dev
Diffstat (limited to 'indra/newview/llagentpicksinfo.cpp')
-rw-r--r--indra/newview/llagentpicksinfo.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llagentpicksinfo.cpp b/indra/newview/llagentpicksinfo.cpp
index 17464dcef9..e2a2d2d8a9 100644
--- a/indra/newview/llagentpicksinfo.cpp
+++ b/indra/newview/llagentpicksinfo.cpp
@@ -123,5 +123,5 @@ void LLAgentPicksInfo::onServerRespond(LLAvatarData* picks)
return;
}
- setNumberOfPicks(picks->picks_list.size());
+ setNumberOfPicks(static_cast<S32>(picks->picks_list.size()));
}