Fix mesh info panel not disabling LOD_swap_LOD_Change_label & add some more minor optimizations

Fri, 01 Dec 2017 12:50:30 +0100

author
Ansariel
date
Fri, 01 Dec 2017 12:50:30 +0100
changeset 53523
24778a73e766
parent 53522
3b4fe4d6b487
child 53524
29ac67093911

Fix mesh info panel not disabling LOD_swap_LOD_Change_label & add some more minor optimizations

indra/newview/llpanelobject.cpp file | annotate | diff | revisions
     1.1 --- a/indra/newview/llpanelobject.cpp	Fri Dec 01 12:36:22 2017 +0100
     1.2 +++ b/indra/newview/llpanelobject.cpp	Fri Dec 01 12:50:30 2017 +0100
     1.3 @@ -1533,12 +1533,8 @@
     1.4  	childSetVisible("lod_num_tris", TRUE);
     1.5  	childSetVisible("mesh_lod_label", TRUE);
     1.6  	// Mesh specific display
     1.7 -	mComboLOD = getChild<LLComboBox>("LOD_show_combo");
     1.8 -	if (mComboLOD)
     1.9 -	{
    1.10 -		mComboLOD->setEnabled(TRUE);
    1.11 -		mComboLOD->setVisible(TRUE);
    1.12 -	}
    1.13 +	mComboLOD->setEnabled(TRUE);
    1.14 +	mComboLOD->setVisible(TRUE);
    1.15  
    1.16  	F32 radius;
    1.17  
    1.18 @@ -1573,7 +1569,6 @@
    1.19  	childSetVisible("LOD_swap_usr_label", true);
    1.20  	childSetVisible("LOD_swap_factors_label", true);
    1.21  	childSetVisible("LOD_swap_label", true);
    1.22 -	childSetVisible("LOD_swap_usr_label", true);
    1.23  	childSetVisible("LOD_swap_LOD_Change_label", true);
    1.24  	childSetVisible("LODSwapTableDscriptionsText", true);
    1.25  	childSetVisible("ObjectLODbehaviourLabel", true);
    1.26 @@ -1625,7 +1620,6 @@
    1.27  
    1.28  void LLPanelObject::deactivateMeshFields()
    1.29  {
    1.30 -
    1.31  	childSetVisible("mesh_info_label", FALSE);
    1.32  	childSetVisible("lod_label", FALSE);
    1.33  	childSetVisible("lod_num_tris", FALSE);
    1.34 @@ -1635,26 +1629,20 @@
    1.35  	gSavedSettings.setS32("ShowSpecificLODInEdit", -1);
    1.36  	// </FS:Beq>
    1.37  
    1.38 -	mComboLOD = getChild<LLComboBox>("LOD_show_combo");
    1.39 -	if (mComboLOD)
    1.40 -	{
    1.41 -		mComboLOD->setCurrentByIndex(0);
    1.42 -		mComboLOD->setEnabled(FALSE);
    1.43 -		mComboLOD->setVisible(FALSE);
    1.44 -	}
    1.45 +	mComboLOD->setCurrentByIndex(0);
    1.46 +	mComboLOD->setEnabled(FALSE);
    1.47 +	mComboLOD->setVisible(FALSE);
    1.48 +
    1.49  	childSetVisible("object_radius", FALSE);
    1.50  	LLTextBox* tb = getChild<LLTextBox>("object_radius_value");
    1.51 -	if (tb)
    1.52 -	{
    1.53 -		tb->setVisible(FALSE);
    1.54 -	}
    1.55 -	
    1.56 +	tb->setVisible(FALSE);
    1.57 +
    1.58  	childSetVisible("ObjectLODbehaviourLabel", false);
    1.59  	childSetVisible("LOD_swap_defaults_label", false);
    1.60  	childSetVisible("LOD_swap_factors_label", false);
    1.61  	childSetVisible("LOD_swap_usr_label", false);
    1.62  	childSetVisible("LOD_swap_label", false);
    1.63 -	childSetVisible("LOD_swap_usr_label", false);
    1.64 +	childSetVisible("LOD_swap_LOD_Change_label", false);
    1.65  	childSetVisible("LOD_swap_H2M_label", false);
    1.66  	childSetVisible("LOD_swap_M2L_label", false);
    1.67  	childSetVisible("LOD_swap_L2I_label", false);

mercurial