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

Merge viewer-neko

meow-7.2.2
Ansariel 2019-08-31 14:32:43 +02:00
parent 642d28245f 204d9c35e0
commit 5c86d6298a
5 changed files with 57 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/llui/llmenugl.cpp
View File

@ -809,6 +809,12 @@ void LLMenuItemCallGL::initFromParams(const Params& p)
{
setEnabledControlVariable(control);
}
else
{
LL_WARNS() << "Failed to assign 'enabled' control variable to menu " << getName()
<< ": control " << p.on_enable.control_name()
<< " does not exist." << LL_ENDL;
}
}
}
if (p.on_click.isProvided())

37
indra/llui/lluictrl.cpp
View File

@ -137,13 +137,29 @@ void LLUICtrl::initFromParams(const Params& p)
{
LLControlVariable* control = findControl(p.enabled_controls.enabled);
if (control)
{
setEnabledControlVariable(control);
}
else
{
LL_WARNS() << "Failed to assign 'enabled' control variable to " << getName()
<< ": control " << p.enabled_controls.enabled()
<< " does not exist." << LL_ENDL;
}
}
else if(p.enabled_controls.disabled.isChosen())
{
LLControlVariable* control = findControl(p.enabled_controls.disabled);
if (control)
{
setDisabledControlVariable(control);
}
else
{
LL_WARNS() << "Failed to assign 'disabled' control variable to " << getName()
<< ": control " << p.enabled_controls.disabled()
<< " does not exist." << LL_ENDL;
}
}
}
// <FS:Zi> Decide if a control should be visible, according to ControlVisibility
@ -155,7 +171,15 @@ void LLUICtrl::initFromParams(const Params& p)
{
LLControlVariable* control = findControl(p.controls_visibility.visible);
if (control)
{
setMakeVisibleControlVariable(control);
}
else
{
LL_WARNS() << "Failed to assign visibility control variable to " << getName()
<< ": control " << p.controls_visibility.visible()
<< " does not exist." << LL_ENDL;
}
}
// <FS:Zi> Decide if a control should be visible, according to ControlVisibility
// else if (p.controls_visibility.invisible.isChosen())
@ -164,7 +188,15 @@ void LLUICtrl::initFromParams(const Params& p)
{
LLControlVariable* control = findControl(p.controls_visibility.invisible);
if (control)
{
setMakeInvisibleControlVariable(control);
}
else
{
LL_WARNS() << "Failed to assign invisibility control variable to " << getName()
<< ": control " << p.controls_visibility.invisible()
<< " does not exist." << LL_ENDL;
}
}
// <FS:Zi> Decide if a control should be visible, according to ControlVisibility
// }
@ -505,6 +537,11 @@ void LLUICtrl::setControlName(const std::string& control_name, LLView *context)
if (!control_name.empty())
{
LLControlVariable* control = context->findControl(control_name);
if (!control)
{
LL_WARNS() << "Failed to assign control variable to " << getName()
<< ": control "<< control_name << " does not exist." << LL_ENDL;
}
setControlVariable(control);
}
}

10
indra/newview/llcontrolavatar.cpp
View File

@ -171,7 +171,10 @@ void LLControlAvatar::matchVolumeTransform()
if (attached_av)
{
LLViewerJointAttachment *attach = attached_av->getTargetAttachmentPoint(mRootVolp);
setPositionAgent(mRootVolp->getRenderPosition());
if (getRegion() && !isDead())
{
setPositionAgent(mRootVolp->getRenderPosition());
}
attach->updateWorldPRSParent();
LLVector3 joint_pos = attach->getWorldPosition();
LLQuaternion joint_rot = attach->getWorldRotation();
@ -227,7 +230,10 @@ void LLControlAvatar::matchVolumeTransform()
#endif
setRotation(bind_rot*obj_rot);
mRoot->setWorldRotation(bind_rot*obj_rot);
setPositionAgent(vol_pos);
if (getRegion() && !isDead())
{
setPositionAgent(vol_pos);
}
mRoot->setPosition(vol_pos + mPositionConstraintFixup);
F32 global_scale = gSavedSettings.getF32("AnimatedObjectsGlobalScale");

3
indra/newview/pipeline.cpp
View File

@ -8877,7 +8877,8 @@ void LLPipeline::renderDeferredLighting()
const LLViewerObject *vobj = drawablep->getVObj();
if(vobj && vobj->getAvatar()
&& (vobj->getAvatar()->isTooComplex() || vobj->getAvatar()->isInMuteList()))
&& (vobj->getAvatar()->isTooComplex() || vobj->getAvatar()->isInMuteList())
|| (vobj && dist_vec(vobj->getPosition(), LLViewerCamera::getInstance()->getOrigin()) > RenderFarClip))
{
continue;
}

4
indra/newview/skins/default/xui/en/notifications.xml
View File

@ -2333,6 +2333,7 @@ Unable to create output file: [FILE]
icon="alertmodal.tga"
name="DoNotSupportBulkAnimationUpload"
type="alertmodal">
<unique/>
[APP_NAME] does not currently support bulk upload of BVH format animation files.
<tag>fail</tag>
</notification>
@ -3549,6 +3550,9 @@ Display settings have been set to recommended levels because of a change to the
icon="alertmodal.tga"
name="ErrorMessage"
type="alertmodal">
<unique>
<context>ERROR_MESSAGE</context>
</unique>
[ERROR_MESSAGE]
<tag>fail</tag>
<usetemplate