Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'animesh' of https://github.com/singularity-viewer/SingularityViewer.git into animesh

Browse Source
This commit is contained in:
Shyotl
2019-10-19 00:00:50 -05:00
parent 15c3ff0544 bcadee8575
commit 4d5e5e1635
18 changed files with 79 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/llmeshrepository.cpp
View File

@@ -2686,7 +2686,7 @@ void LLMeshRepository::notifyLoadedMeshes()
void LLMeshRepository::notifySkinInfoReceived(LLMeshSkinInfo& info)
{
mSkinMap[info.mMeshID] = info;
mSkinMap.insert_or_assign(info.mMeshID, info);
skin_load_map::iterator iter = mLoadingSkins.find(info.mMeshID);
if (iter != mLoadingSkins.end())
@@ -2793,8 +2793,8 @@ const LLMeshSkinInfo* LLMeshRepository::getSkinInfo(const LLUUID& mesh_id, const
{
if (mesh_id.notNull())
{
skin_map::iterator iter = mSkinMap.find(mesh_id);
if (iter != mSkinMap.end())
const auto iter = mSkinMap.find(mesh_id);
if (iter != mSkinMap.cend())
{
return &(iter->second);
}