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

Feature Request: Option to focus on avatar from instant message with them

Browse Source 
Will be in the dropdown in IM at the bottom, only if they're in the sim...
Actually, this feature works pretty well as an in-sim indicator (if it works as intended!)
This commit is contained in:
Lirusaito
2016-05-02 19:06:12 -04:00
parent a8062d732e
commit e50899dc68
5 changed files with 52 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
indra/newview/llviewerobjectlist.cpp
View File

@@ -101,6 +101,15 @@ class AIHTTPTimeoutPolicy;
extern AIHTTPTimeoutPolicy objectCostResponder_timeout;
extern AIHTTPTimeoutPolicy physicsFlagsResponder_timeout;
// <singu>
#include "llimpanel.h"
#include "llimview.h"
LLFloaterIMPanel* find_im_floater(const LLUUID& id)
{
return gIMMgr->findFloaterBySession(id ^ gAgentID);
}
// </singu>
#define CULL_VIS
//#define ORPHAN_SPAM
//#define IGNORE_DEAD
@@ -1256,7 +1265,11 @@ void LLViewerObjectList::cleanupReferences(LLViewerObject *objectp)
// Remove from object map so noone can look it up.
mUUIDObjectMap.erase(objectp->mID);
mUUIDAvatarMap.erase(objectp->mID);//No need to be careful here.
// <singu> Use the return value (number of erased elements) to determine if we were an avatar.
if (mUUIDAvatarMap.erase(objectp->mID)) //No need to be careful here.
if (LLFloaterIMPanel* im = find_im_floater(objectp->mID))
im->removeDynamicFocus();
// </singu>
//if (objectp->getRegion())
//{
@@ -1978,7 +1991,13 @@ LLViewerObject *LLViewerObjectList::createObjectViewer(const LLPCode pcode, LLVi
{
LLVOAvatar *pAvatar = dynamic_cast<LLVOAvatar*>(objectp);
if(pAvatar)
{
mUUIDAvatarMap[fullid] = pAvatar;
// <singu>
if (LLFloaterIMPanel* im = find_im_floater(fullid))
im->addDynamicFocus();
// </singu>
}
}
mObjects.push_back(objectp);
@@ -2018,7 +2037,13 @@ LLViewerObject *LLViewerObjectList::createObject(const LLPCode pcode, LLViewerRe
{
LLVOAvatar *pAvatar = dynamic_cast<LLVOAvatar*>(objectp);
if(pAvatar)
{
mUUIDAvatarMap[fullid] = pAvatar;
// <singu>
if (LLFloaterIMPanel* im = find_im_floater(fullid))
im->addDynamicFocus();
// </singu>
}
}
setUUIDAndLocal(fullid,
local_id,