livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make sure we stand up when derendering an object we are sitting on

meow-7.2.2
Ansariel 2016-08-26 14:04:42 +02:00
parent a079baa258
commit 120e06bb85
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
indra/newview/llviewermenu.cpp
View File

@ -2883,6 +2883,26 @@ void derenderObject(bool permanent)
}
else
{
LLViewerObject::child_list_t object_children = objp->getChildren();
for (LLViewerObject::child_list_t::const_iterator it = object_children.begin(); it != object_children.end(); it++)
{
LLViewerObject* child = *it;
if (child->isAvatar() && child->asAvatar()->isSelf())
{
if (gRlvHandler.hasBehaviour(RLV_BHVR_UNSIT))
{
// RLVa: Prevent cheating out of sitting by derendering the object
select_mgr->deselectObjectOnly(objp);
return;
}
else
{
gAgent.standUp();
break;
}
}
}
LLSelectNode* nodep = select_mgr->getSelection()->getFirstRootNode();
if (nodep)
{