#3971 Fix wrong material type when 'editing linked'
parent
167b7bae62
commit
851a503930
|
|
@ -582,7 +582,7 @@ void LLPanelVolume::getState( )
|
|||
|
||||
bool enable_material = editable && single_volume && material_same;
|
||||
LLCachedControl<bool> edit_linked(gSavedSettings, "EditLinkedParts", false);
|
||||
if (!enable_material && !edit_linked())
|
||||
if (!enable_material)
|
||||
{
|
||||
LLViewerObject* root = selection->getPrimaryObject();
|
||||
while (root && !root->isAvatar() && root->getParent())
|
||||
|
|
@ -592,6 +592,10 @@ void LLPanelVolume::getState( )
|
|||
{
|
||||
break;
|
||||
}
|
||||
if (!parent->isSelected())
|
||||
{
|
||||
break;
|
||||
}
|
||||
root = parent;
|
||||
}
|
||||
if (root)
|
||||
|
|
|
|||
Loading…
Reference in New Issue