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

8
indra/newview/llviewerobjectlist.cpp
View File

@@ -1997,13 +1997,13 @@ LLViewerObject *LLViewerObjectList::createObjectViewer(const LLPCode pcode, LLVi
return NULL;
}
mUUIDObjectMap[fullid] = objectp;
mUUIDObjectMap.insert_or_assign(fullid, objectp);
if(objectp->isAvatar())
{
LLVOAvatar *pAvatar = dynamic_cast<LLVOAvatar*>(objectp);
if(pAvatar)
{
mUUIDAvatarMap[fullid] = pAvatar;
mUUIDAvatarMap.insert_or_assign(fullid, pAvatar);
// <singu>
if (LLFloaterIMPanel* im = find_im_floater(fullid))
im->addDynamicFocus();
@@ -2047,13 +2047,13 @@ LLViewerObject *LLViewerObjectList::createObject(const LLPCode pcode, LLViewerRe
regionp->addToCreatedList(local_id);
}
mUUIDObjectMap[fullid] = objectp;
mUUIDObjectMap.insert_or_assign(fullid, objectp);
if(objectp->isAvatar())
{
LLVOAvatar *pAvatar = dynamic_cast<LLVOAvatar*>(objectp);
if(pAvatar)
{
mUUIDAvatarMap[fullid] = pAvatar;
mUUIDAvatarMap.insert_or_assign(fullid, pAvatar);
// <singu>
if (LLFloaterIMPanel* im = find_im_floater(fullid))
im->addDynamicFocus();