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

Intermiediary commit.

Browse Source
This commit is contained in:
Shyotl
2019-03-16 17:51:00 -05:00
parent 7cf55fa993
commit 2d8fbb89c9
58 changed files with 1857 additions and 1057 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/llvoavatarself.cpp
View File

@@ -260,6 +260,8 @@ void LLVOAvatarSelf::initInstance()
doPeriodically(update_avatar_rez_metrics, 5.0);
doPeriodically(check_for_unsupported_baked_appearance, 120.0);
doPeriodically(boost::bind(&LLVOAvatarSelf::checkStuckAppearance, this), 30.0);
mInitFlags |= 1<<2;
}
void LLVOAvatarSelf::setHoverIfRegionEnabled()
@@ -609,6 +611,13 @@ LLJoint *LLVOAvatarSelf::getJoint(const std::string &name)
if (!jointp && mScreenp)
{
jointp = mScreenp->findJoint(name);
if (jointp)
{
joint_map_t::value_type entry;
strncpy(entry.first, name.c_str(), sizeof(entry.first));
entry.second = jointp;
mJointMap.emplace_back(entry);
}
}
return jointp;
@@ -3107,7 +3116,7 @@ BOOL LLVOAvatarSelf::needsRenderBeam()
// don't render selection beam on hud objects
is_touching_or_grabbing = FALSE;
}
return is_touching_or_grabbing || (mState & AGENT_STATE_EDITING && LLSelectMgr::getInstance()->shouldShowSelection());
return is_touching_or_grabbing || (getAttachmentState() & AGENT_STATE_EDITING && LLSelectMgr::getInstance()->shouldShowSelection());
}
void dump_visual_param(apr_file_t* file, LLVisualParam const* viewer_param, F32 value);