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

Addition to allow the mesh info display where object perms are no mod

meow-7.2.2
Beq 2017-10-12 14:54:08 +01:00
parent 001f94ccc8
commit c03d071ffe
2 changed files with 71 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
indra/newview/llpanelobject.cpp
View File

@ -1343,10 +1343,11 @@ void LLPanelObject::getState( )
//</FS:Beq>
// sculpt texture
if (selected_item == MI_SCULPT)
//<FS:Beq> extend mesh info to no-edit items
if (selected_item == MI_SCULPT || mSelectedType == MI_NONE)
//</FS:Beq>
{
LLUUID id;
LLSculptParams *sculpt_params = (LLSculptParams *)objectp->getParameterEntry(LLNetworkData::PARAMS_SCULPT);
@ -1368,14 +1369,13 @@ void LLPanelObject::getState( )
// <FS:Beq> FIRE-21445 - Show specific LOD + Mesh Info in object panel
if (isMesh)
{
mComboBaseType->setEnabled(FALSE);
mComboBaseType->setVisible(FALSE);
mCtrlSculptTexture->setVisible(FALSE);
mLabelSculptType->setVisible(FALSE);
mCtrlSculptType->setVisible(FALSE);
sculpt_texture_visible = FALSE;
deactivateStandardFields();
activateMeshFields(objectp);
}
else if (!isMesh && mSelectedType == MI_NONE)
{
// Do nothing as the perms are off.
}
else
//</FS:Beq>
{
@ -1441,6 +1441,68 @@ void LLPanelObject::getState( )
}
}
//<FS:Beq> FIRE-21445 + Mesh Info in object panel
// Helper function duplicating the inline switch statements which ideally we'd refactor but...ugh MAINT
void LLPanelObject::deactivateStandardFields()
{
// Update field visibility
mComboBaseType->setEnabled(FALSE);
mComboBaseType->setVisible(FALSE);
mLabelCut->setVisible(FALSE);
mSpinCutBegin->setVisible(FALSE);
mSpinCutEnd->setVisible(FALSE);
mLabelHollow->setVisible(FALSE);
mSpinHollow->setVisible(FALSE);
mLabelHoleType->setVisible(FALSE);
mComboHoleType->setVisible(FALSE);
mLabelTwist->setVisible(FALSE);
mSpinTwist->setVisible(FALSE);
mSpinTwistBegin->setVisible(FALSE);
mSpinTwist->setMinValue(FALSE);
mSpinTwist->setMaxValue(FALSE);
mSpinTwist->setIncrement(FALSE);
mSpinTwistBegin->setMinValue(FALSE);
mSpinTwistBegin->setMaxValue(FALSE);
mSpinTwistBegin->setIncrement(FALSE);
mSpinScaleX->setVisible(FALSE);
mSpinScaleY->setVisible(FALSE);
mLabelSkew->setVisible(FALSE);
mSpinSkew->setVisible(FALSE);
mLabelShear->setVisible(FALSE);
mSpinShearX->setVisible(FALSE);
mSpinShearY->setVisible(FALSE);
mCtrlPathBegin->setVisible(FALSE);
mCtrlPathEnd->setVisible(FALSE);
mLabelTaper->setVisible(FALSE);
mSpinTaperX->setVisible(FALSE);
mSpinTaperY->setVisible(FALSE);
mLabelRadiusOffset->setVisible(FALSE);
mSpinRadiusOffset->setVisible(FALSE);
mLabelRevolutions->setVisible(FALSE);
mSpinRevolutions->setVisible(FALSE);
mCtrlSculptTexture->setVisible(FALSE);
mLabelSculptType->setVisible(FALSE);
mCtrlSculptType->setVisible(FALSE);
getChildView("scale_hole")->setVisible(FALSE);
getChildView("scale_taper")->setVisible(FALSE);
getChildView("advanced_cut")->setVisible(FALSE);
getChildView("advanced_dimple")->setVisible(FALSE);
getChildView("advanced_slice")->setVisible(FALSE);
}
void LLPanelObject::activateMeshFields(LLViewerObject * objectp)
{
static const char * dataFields[4] = { "lowest_lod_num_tris", "low_lod_num_tris", "med_lod_num_tris", "high_lod_num_tris" };

1
indra/newview/llpanelobject.h
View File

@ -94,6 +94,7 @@ public:
protected:
void getState();
//<FS:Beq> FIRE-21445 + Mesh Info in object panel
void LLPanelObject::deactivateStandardFields();
void activateMeshFields(LLViewerObject * objectp);
void deactivateMeshFields();
//</FS:Beq>