Revised Mesh Information panel impl

Thu, 30 Nov 2017 17:05:57 +0000

author
Beq <beqjanus@gmail.com>
date
Thu, 30 Nov 2017 17:05:57 +0000
changeset 53513
f7d79a4ad52e
parent 53512
d9511cd44306
child 53514
ef13080e6d8f

Revised Mesh Information panel impl

indra/newview/llpanelobject.cpp file | annotate | diff | revisions
indra/newview/llpanelobject.h file | annotate | diff | revisions
indra/newview/skins/default/xui/en/floater_tools.xml file | annotate | diff | revisions
indra/newview/skins/starlight/xui/en/floater_tools.xml file | annotate | diff | revisions
indra/newview/skins/starlightcui/xui/en/floater_tools.xml file | annotate | diff | revisions
indra/newview/skins/vintage/xui/en/floater_tools.xml file | annotate | diff | revisions
     1.1 --- a/indra/newview/llpanelobject.cpp	Tue Nov 28 21:27:25 2017 +0000
     1.2 +++ b/indra/newview/llpanelobject.cpp	Thu Nov 30 17:05:57 2017 +0000
     1.3 @@ -1515,23 +1515,23 @@
     1.4  
     1.5  void LLPanelObject::activateMeshFields(LLViewerObject * objectp)
     1.6  {
     1.7 -	static const char * dataFields[4] = { "lowest_lod_num_tris", "low_lod_num_tris", "med_lod_num_tris", "high_lod_num_tris" };
     1.8 -	for (int i = 0; i < 4; i++)
     1.9 +	LLStringUtil::format_map_t args;
    1.10 +	static const char * dataFields[4] = { "LOWESTTRIS", "LOWTRIS", "MIDTRIS", "HIGHTRIS" };
    1.11 +
    1.12 +	LLTextBox *num_tris = getChild<LLTextBox>("mesh_lod_num_tris");
    1.13 +	if (num_tris)
    1.14  	{
    1.15 -		LLTextBox *num_tris = getChild<LLTextBox>(dataFields[i]);
    1.16 -		if (num_tris)
    1.17 +		for (int i = 0; i < 4; i++)
    1.18  		{
    1.19 -			num_tris->setText(llformat("%d", objectp->mDrawable->getVOVolume()->getLODTriangleCount(i)));
    1.20 -			num_tris->setVisible(TRUE);
    1.21 +			args[dataFields[i]] = llformat("%d", objectp->mDrawable->getVOVolume()->getLODTriangleCount(i));
    1.22  		}
    1.23 +		num_tris->setText(getString("mesh_lod_num_tris_values",args));
    1.24 +		num_tris->setVisible(TRUE);
    1.25  	}
    1.26  	childSetVisible("mesh_info_label", TRUE);
    1.27  	childSetVisible("lod_label", TRUE);
    1.28  	childSetVisible("lod_num_tris", TRUE);
    1.29 -	childSetVisible("high_lod_label", TRUE);
    1.30 -	childSetVisible("med_lod_label", TRUE);
    1.31 -	childSetVisible("low_lod_label", TRUE);
    1.32 -	childSetVisible("lowest_lod_label", TRUE);
    1.33 +	childSetVisible("mesh_lod_label", TRUE);
    1.34  	// Mesh specific display
    1.35  	mComboLOD = getChild<LLComboBox>("LOD_show_combo");
    1.36  	if (mComboLOD)
    1.37 @@ -1569,7 +1569,7 @@
    1.38  	LLTextBox* tb = getChild<LLTextBox>("object_radius_value");
    1.39  	if (tb)
    1.40  	{
    1.41 -		tb->setText(llformat("%f", radius));
    1.42 +		tb->setText(llformat("%.3f", radius));
    1.43  		tb->setVisible(TRUE);
    1.44  	}
    1.45  	
    1.46 @@ -1578,99 +1578,59 @@
    1.47  	childSetVisible("LOD_swap_factors_label", TRUE);
    1.48  	childSetVisible("LOD_swap_label", TRUE);
    1.49  	childSetVisible("LOD_swap_usr_label", TRUE);
    1.50 -	childSetVisible("LOD_swap_H2M_label", TRUE);
    1.51 -	childSetVisible("LOD_swap_M2L_label", TRUE);
    1.52 -	childSetVisible("LOD_swap_L2I_label", TRUE);
    1.53 +	childSetVisible("LOD_swap_LOD_Change_label", TRUE);
    1.54  	childSetVisible("LODSwapTableDscriptionsText", TRUE);
    1.55  	childSetVisible("ObjectLODbehaviourLabel", TRUE);
    1.56 -
    1.57 +	childSetVisible("LOD_swap_ll_default", TRUE);
    1.58 +	childSetVisible("LOD_swap_fs_default", TRUE);
    1.59 +	childSetVisible("LOD_swap_usr_current", TRUE);
    1.60 +
    1.61 +	// Setup the LL defaults
    1.62  	factor = 1.125; // LL default for most people http://wiki.phoenixviewer.com/support:whirly_fizzle#lod_comparison
    1.63 +	args["FACTOR"] = llformat("%.3f", factor);
    1.64  	tb = getChild<LLTextBox>("LOD_swap_ll_default");
    1.65  	if (tb)
    1.66  	{
    1.67 -		LLUIString factor_string = tb->getText();
    1.68 -		factor_string.setArg("[FACTOR]", llformat("%.2f", factor));
    1.69 -		tb->setText(factor_string.getString());
    1.70 +		tb->setToolTip(getString("ll_lod_tooltip_msg",args));
    1.71  		tb->setVisible(TRUE);
    1.72  	}
    1.73 -	tb = getChild<LLTextBox>("LOD_swap_ll_H2M");
    1.74 -	if (tb)
    1.75 -	{
    1.76 -		tb->setText(llformat("%.1f", factor*dmid));
    1.77 -		tb->setVisible(TRUE);
    1.78 -		tb->setEnabled(TRUE);
    1.79 -	}
    1.80 -	tb = getChild<LLTextBox>("LOD_swap_ll_M2L");
    1.81 -	if (tb)
    1.82 -	{
    1.83 -		tb->setText(llformat("%.1f", factor*dlow));
    1.84 -		tb->setVisible(TRUE);
    1.85 -		tb->setEnabled(TRUE);
    1.86 -	}
    1.87 -	tb = getChild<LLTextBox>("LOD_swap_ll_L2I");
    1.88 -	if (tb)
    1.89 -	{
    1.90 -		tb->setText(llformat("%.1f", factor*dlowest));
    1.91 -		tb->setVisible(TRUE);
    1.92 -		tb->setEnabled(TRUE);
    1.93 -	}
    1.94 +	tb = getChild<LLTextBox>("LOD_swap_ll_values");
    1.95 +	setLODDistValues(tb, factor, dmid, dlow, dlowest);
    1.96 +
    1.97 +	// now the FS defaults
    1.98  	factor = 2.0;
    1.99 +	args["FACTOR"] = llformat("%.3f", factor);
   1.100  	tb = getChild<LLTextBox>("LOD_swap_fs_default");
   1.101  	if (tb)
   1.102  	{
   1.103 -		LLUIString factor_string = tb->getText();
   1.104 -		factor_string.setArg("[FACTOR]", llformat("%.2f", factor));
   1.105 -		tb->setText(factor_string.getString());
   1.106 +		tb->setToolTip(getString("fs_lod_tooltip_msg", args));
   1.107  		tb->setVisible(TRUE);
   1.108  	}
   1.109 -	tb = getChild<LLTextBox>("LOD_swap_fs_H2M");
   1.110 -	if (tb)
   1.111 -	{
   1.112 -		tb->setText(llformat("%.1f", factor*dmid));
   1.113 -		tb->setVisible(TRUE);
   1.114 -		tb->setEnabled(TRUE);
   1.115 -	}
   1.116 -	tb = getChild<LLTextBox>("LOD_swap_fs_M2L");
   1.117 -	if (tb)
   1.118 -	{
   1.119 -		tb->setText(llformat("%.1f", factor*dlow));
   1.120 -		tb->setVisible(TRUE);
   1.121 -		tb->setEnabled(TRUE);
   1.122 -	}
   1.123 -	tb = getChild<LLTextBox>("LOD_swap_fs_L2I");
   1.124 -	if (tb)
   1.125 -	{
   1.126 -		tb->setText(llformat("%.1f", factor*dlowest));
   1.127 -		tb->setVisible(TRUE);
   1.128 -		tb->setEnabled(TRUE);
   1.129 -	}
   1.130 +	tb = getChild<LLTextBox>("LOD_swap_fs_values");
   1.131 +	setLODDistValues(tb, factor, dmid, dlow, dlowest);
   1.132 +
   1.133 +	// finally the user's own LODFactor
   1.134  	factor = LLVOVolume::sLODFactor;
   1.135 +	args["FACTOR"] = llformat("%.3f", factor);
   1.136  	tb = getChild<LLTextBox>("LOD_swap_usr_current");
   1.137  	if (tb)
   1.138  	{
   1.139 -		LLUIString factor_string = getString("user_lod_label_string");
   1.140 -		factor_string.setArg("[FACTOR]", llformat("%.2f", factor));
   1.141 -		tb->setText(factor_string.getString());
   1.142 +		tb->setText(getString("user_lod_label_string", args));// Note: here we are setting the label not the tooltip
   1.143  		tb->setVisible(TRUE);
   1.144  	}
   1.145 -	tb = getChild<LLTextBox>("LOD_swap_usr_H2M");
   1.146 +	tb = getChild<LLTextBox>("LOD_swap_usr_values");
   1.147 +	setLODDistValues(tb, factor, dmid, dlow, dlowest);
   1.148 +}
   1.149 +
   1.150 +void LLPanelObject::setLODDistValues(LLTextBox * tb, F32 factor, F32 dmid, F32 dlow, F32 dlowest)
   1.151 +{
   1.152  	if (tb)
   1.153  	{
   1.154 -		tb->setText(llformat("%.1f", factor*dmid));
   1.155 -		tb->setVisible(TRUE);
   1.156 -		tb->setEnabled(TRUE);
   1.157 -	}
   1.158 -	tb = getChild<LLTextBox>("LOD_swap_usr_M2L");
   1.159 -	if (tb)
   1.160 -	{
   1.161 -		tb->setText(llformat("%.1f", factor*dlow));
   1.162 -		tb->setVisible(TRUE);
   1.163 -		tb->setEnabled(TRUE);
   1.164 -	}
   1.165 -	tb = getChild<LLTextBox>("LOD_swap_usr_L2I");
   1.166 -	if (tb)
   1.167 -	{
   1.168 -		tb->setText(llformat("%.1f", factor*dlowest));
   1.169 +		LLStringUtil::format_map_t args;
   1.170 +		args["HIGH2MED"] = llformat("%.1f", factor*dmid);
   1.171 +		args["MED2LOW"] = llformat("%.1f", factor*dlow);
   1.172 +		args["LOW2LOWEST"] = llformat("%.1f", factor*dlowest);
   1.173 +		tb->setText(getString("LODSwapFormatString",args));
   1.174  		tb->setVisible(TRUE);
   1.175  		tb->setEnabled(TRUE);
   1.176  	}
   1.177 @@ -1678,23 +1638,12 @@
   1.178  
   1.179  void LLPanelObject::deactivateMeshFields()
   1.180  {
   1.181 -	static const char * dataFields[4] = { "lowest_lod_num_tris", "low_lod_num_tris", "med_lod_num_tris", "high_lod_num_tris" };
   1.182 -	for (int i = 0; i < 4; i++)
   1.183 -	{
   1.184 -		LLTextBox *num_tris = getChild<LLTextBox>(dataFields[i]);
   1.185 -		if (num_tris)
   1.186 -		{
   1.187 -			num_tris->setVisible(FALSE);
   1.188 -		}
   1.189 -	}
   1.190  
   1.191  	childSetVisible("mesh_info_label", FALSE);
   1.192  	childSetVisible("lod_label", FALSE);
   1.193  	childSetVisible("lod_num_tris", FALSE);
   1.194 -	childSetVisible("high_lod_label", FALSE);
   1.195 -	childSetVisible("med_lod_label", FALSE);
   1.196 -	childSetVisible("low_lod_label", FALSE);
   1.197 -	childSetVisible("lowest_lod_label", FALSE);
   1.198 +	childSetVisible("mesh_lod_num_tris", FALSE);
   1.199 +	childSetVisible("mesh_lod_label", FALSE);
   1.200  	// reset the debug setting as we are editing a new object
   1.201  	gSavedSettings.setS32("ShowSpecificLODInEdit", -1);
   1.202  	// </FS:Beq>
   1.203 @@ -1723,76 +1672,12 @@
   1.204  	childSetVisible("LOD_swap_M2L_label", FALSE);
   1.205  	childSetVisible("LOD_swap_L2I_label", FALSE);
   1.206  	childSetVisible("LODSwapTableDscriptionsText", FALSE);
   1.207 -
   1.208 -	tb = getChild<LLTextBox>("LOD_swap_ll_default");
   1.209 -	if (tb)
   1.210 -	{
   1.211 -		tb->setVisible(FALSE);
   1.212 -	}
   1.213 -	tb = getChild<LLTextBox>("LOD_swap_ll_H2M");
   1.214 -	if (tb)
   1.215 -	{
   1.216 -		tb->setVisible(FALSE);
   1.217 -		tb->setEnabled(FALSE);
   1.218 -	}
   1.219 -	tb = getChild<LLTextBox>("LOD_swap_ll_M2L");
   1.220 -	if (tb)
   1.221 -	{
   1.222 -		tb->setVisible(FALSE);
   1.223 -		tb->setEnabled(FALSE);
   1.224 -	}
   1.225 -	tb = getChild<LLTextBox>("LOD_swap_ll_L2I");
   1.226 -	if (tb)
   1.227 -	{
   1.228 -		tb->setVisible(FALSE);
   1.229 -		tb->setEnabled(FALSE);
   1.230 -	}
   1.231 -	tb = getChild<LLTextBox>("LOD_swap_fs_default");
   1.232 -	if (tb)
   1.233 -	{
   1.234 -		tb->setVisible(FALSE);
   1.235 -	}
   1.236 -	tb = getChild<LLTextBox>("LOD_swap_fs_H2M");
   1.237 -	if (tb)
   1.238 -	{
   1.239 -		tb->setVisible(FALSE);
   1.240 -		tb->setEnabled(FALSE);
   1.241 -	}
   1.242 -	tb = getChild<LLTextBox>("LOD_swap_fs_M2L");
   1.243 -	if (tb)
   1.244 -	{
   1.245 -		tb->setVisible(FALSE);
   1.246 -		tb->setEnabled(FALSE);
   1.247 -	}
   1.248 -	tb = getChild<LLTextBox>("LOD_swap_fs_L2I");
   1.249 -	if (tb)
   1.250 -	{
   1.251 -		tb->setVisible(FALSE);
   1.252 -		tb->setEnabled(FALSE);
   1.253 -	}
   1.254 -	tb = getChild<LLTextBox>("LOD_swap_usr_current");
   1.255 -	if (tb)
   1.256 -	{
   1.257 -		tb->setVisible(FALSE);
   1.258 -	}
   1.259 -	tb = getChild<LLTextBox>("LOD_swap_usr_H2M");
   1.260 -	if (tb)
   1.261 -	{
   1.262 -		tb->setVisible(FALSE);
   1.263 -		tb->setEnabled(FALSE);
   1.264 -	}
   1.265 -	tb = getChild<LLTextBox>("LOD_swap_usr_M2L");
   1.266 -	if (tb)
   1.267 -	{
   1.268 -		tb->setVisible(FALSE);
   1.269 -		tb->setEnabled(FALSE);
   1.270 -	}
   1.271 -	tb = getChild<LLTextBox>("LOD_swap_usr_L2I");
   1.272 -	if (tb)
   1.273 -	{
   1.274 -		tb->setVisible(FALSE);
   1.275 -		tb->setEnabled(FALSE);
   1.276 -	}
   1.277 +	childSetVisible("LOD_swap_ll_default", FALSE);
   1.278 +	childSetVisible("LOD_swap_fs_default", FALSE);
   1.279 +	childSetVisible("LOD_swap_usr_current", FALSE);
   1.280 +	childSetVisible("LOD_swap_ll_values", FALSE);
   1.281 +	childSetVisible("LOD_swap_fs_values", FALSE);
   1.282 +	childSetVisible("LOD_swap_usr_values", FALSE);
   1.283  }
   1.284  //</FS:Beq>
   1.285  
     2.1 --- a/indra/newview/llpanelobject.h	Tue Nov 28 21:27:25 2017 +0000
     2.2 +++ b/indra/newview/llpanelobject.h	Thu Nov 30 17:05:57 2017 +0000
     2.3 @@ -96,6 +96,7 @@
     2.4  	//<FS:Beq> FIRE-21445 + Mesh Info in object panel
     2.5  	void			deactivateStandardFields();
     2.6  	void			activateMeshFields(LLViewerObject * objectp);
     2.7 +	void			setLODDistValues(LLTextBox * tb, F32 factor, F32 dmid, F32 dlow, F32 dlowest);
     2.8  	void			deactivateMeshFields();
     2.9  	//</FS:Beq>
    2.10  	void			sendRotation(BOOL btn_down);
     3.1 --- a/indra/newview/skins/default/xui/en/floater_tools.xml	Tue Nov 28 21:27:25 2017 +0000
     3.2 +++ b/indra/newview/skins/default/xui/en/floater_tools.xml	Thu Nov 30 17:05:57 2017 +0000
     3.3 @@ -2479,87 +2479,31 @@
     3.4          <text
     3.5            follows="left|top"
     3.6            halign="left"
     3.7 -          height="16"
     3.8 +          height="64"
     3.9            layout="topleft"
    3.10            left="125"
    3.11 -          name="high_lod_label"
    3.12 +          name="mesh_lod_label"
    3.13            top_pad="3"
    3.14 -          value="High:"
    3.15            visible="false"
    3.16 -          width="60" />
    3.17 +          width="60" >
    3.18 +High:
    3.19 +Medium:
    3.20 +Low:
    3.21 +Lowest:
    3.22 +        </text>
    3.23 +        <string name="mesh_lod_num_tris_values">
    3.24 +[HIGHTRIS]
    3.25 +[MIDTRIS]
    3.26 +[LOWTRIS]
    3.27 +[LOWESTTRIS]
    3.28 +        </string>
    3.29          <text
    3.30            follows="left|top"
    3.31 -          height="16"
    3.32 +          height="64"
    3.33            layout="topleft"
    3.34            left_pad="10"
    3.35            halign="right"
    3.36 -          name="high_lod_num_tris"
    3.37 -          top_delta="0"
    3.38 -          value="--"
    3.39 -          visible="false"
    3.40 -          width="80" />
    3.41 -        <text
    3.42 -          follows="left|top"
    3.43 -          halign="left"
    3.44 -          height="16"
    3.45 -          layout="topleft"
    3.46 -          left="125"
    3.47 -          name="med_lod_label"
    3.48 -          top_pad="3"
    3.49 -          value="Medium:"
    3.50 -          visible="false"
    3.51 -          width="60" />
    3.52 -        <text
    3.53 -          follows="left|top"
    3.54 -          height="16"
    3.55 -          layout="topleft"
    3.56 -          left_pad="10"
    3.57 -          halign="right"
    3.58 -          name="med_lod_num_tris"
    3.59 -          top_delta="0"
    3.60 -          value="--"
    3.61 -          visible="false"
    3.62 -          width="80" />
    3.63 -        <text
    3.64 -          follows="left|top"
    3.65 -          halign="left"
    3.66 -          height="16"
    3.67 -          layout="topleft"
    3.68 -          left="125"
    3.69 -          name="low_lod_label"
    3.70 -          top_pad="3"
    3.71 -          value="Low:"
    3.72 -          visible="false"
    3.73 -          width="60" />
    3.74 -        <text
    3.75 -          follows="left|top"
    3.76 -          height="16"
    3.77 -          layout="topleft"
    3.78 -          left_pad="10"
    3.79 -          halign="right"
    3.80 -          name="low_lod_num_tris"
    3.81 -          top_delta="0"
    3.82 -          value="--"
    3.83 -          visible="false"
    3.84 -          width="80" />
    3.85 -        <text
    3.86 -          follows="left|top"
    3.87 -          halign="left"
    3.88 -          height="16"
    3.89 -          layout="topleft"
    3.90 -          left="125"
    3.91 -          name="lowest_lod_label"
    3.92 -          top_pad="3"
    3.93 -          value="Lowest:"
    3.94 -          visible="false"
    3.95 -          width="60" />
    3.96 -        <text
    3.97 -          follows="left|top"
    3.98 -          height="16"
    3.99 -          layout="topleft"
   3.100 -          left_pad="10"
   3.101 -          halign="right"
   3.102 -          name="lowest_lod_num_tris"
   3.103 +          name="mesh_lod_num_tris"
   3.104            top_delta="0"
   3.105            value="--"
   3.106            visible="false"
   3.107 @@ -2673,6 +2617,7 @@
   3.108            value="LOD Swap"
   3.109            visible="false"
   3.110            width="60" />
   3.111 +        <string name="ll_lod_tooltip_msg">"Linden Lab Second Life Viewer default ([FACTOR])"</string>
   3.112          <text
   3.113            follows="left|top"
   3.114            height="16"
   3.115 @@ -2681,10 +2626,10 @@
   3.116            halign="center"
   3.117            name="LOD_swap_ll_default"
   3.118            top_delta="0"
   3.119 -          tool_tip="Linden Lab Second Life Viewer default"
   3.120            value="LL"
   3.121            visible="false"
   3.122            width="30" />
   3.123 +        <string name="fs_lod_tooltip_msg">"Firestorm Viewer default ([FACTOR])"</string>
   3.124          <text
   3.125            follows="left|top"
   3.126            height="16"
   3.127 @@ -2692,7 +2637,6 @@
   3.128            left_pad="5"
   3.129            halign="center"
   3.130            name="LOD_swap_fs_default"
   3.131 -          tool_tip="Firestorm default"
   3.132            top_delta="0"
   3.133            value="FS"
   3.134            visible="false"
   3.135 @@ -2712,137 +2656,58 @@
   3.136            width="30" />
   3.137          <text
   3.138            follows="left|top"
   3.139 -          height="16"
   3.140 +          height="50"
   3.141            layout="topleft"
   3.142            left="125"
   3.143 -          halign="center"
   3.144 -          name="LOD_swap_H2M_label"
   3.145 +          halign="left"
   3.146 +          name="LOD_swap_LOD_Change_label"
   3.147            top_pad="3"
   3.148 -          value="High ↔ Med"
   3.149            visible="false"
   3.150 -          width="65" />
   3.151 +          width="65" >
   3.152 +High ↔ Med
   3.153 +Med ↔ Low
   3.154 +Low ↔ Lwst         
   3.155 +        </text>
   3.156 +        <string
   3.157 +          name="LODSwapFormatString"
   3.158 +          visible="false">
   3.159 +[HIGH2MED]
   3.160 +[MED2LOW]
   3.161 +[LOW2LOWEST]
   3.162 +        </string>
   3.163          <text
   3.164            follows="left|top"
   3.165 -          height="16"
   3.166 +          height="50"
   3.167            layout="topleft"
   3.168            left_pad="0"
   3.169 -          halign="center"
   3.170 -          name="LOD_swap_ll_H2M"
   3.171 +          halign="right"
   3.172 +          name="LOD_swap_ll_values"
   3.173 +          top_delta="0"
   3.174 +          visible="false"
   3.175 +          width="30" />
   3.176 +        <text
   3.177 +          follows="left|top"
   3.178 +          height="50"
   3.179 +          layout="topleft"
   3.180 +          left_pad="5"
   3.181 +          halign="right"
   3.182 +          name="LOD_swap_fs_values"
   3.183            top_delta="0"
   3.184            value="--"
   3.185            visible="false"
   3.186            width="30" />
   3.187          <text
   3.188            follows="left|top"
   3.189 -          height="16"
   3.190 +          height="50"
   3.191            layout="topleft"
   3.192            left_pad="5"
   3.193 -          halign="center"
   3.194 -          name="LOD_swap_fs_H2M"
   3.195 +          halign="right"
   3.196 +          name="LOD_swap_usr_values"
   3.197            top_delta="0"
   3.198            value="--"
   3.199            visible="false"
   3.200            width="30" />
   3.201 -        <text
   3.202 -          follows="left|top"
   3.203 -          height="16"
   3.204 -          layout="topleft"
   3.205 -          left_pad="5"
   3.206 -          halign="center"
   3.207 -          name="LOD_swap_usr_H2M"
   3.208 -          top_delta="0"
   3.209 -          value="--"
   3.210 -          visible="false"
   3.211 -          width="30" />
   3.212 -        <text
   3.213 -          follows="left|top"
   3.214 -          height="16"
   3.215 -          layout="topleft"
   3.216 -          left="125"
   3.217 -          halign="center"
   3.218 -          name="LOD_swap_M2L_label"
   3.219 -          top_pad="3"
   3.220 -          value="Med ↔ Low"
   3.221 -          visible="false"
   3.222 -          width="60" />
   3.223 -        <text
   3.224 -          follows="left|top"
   3.225 -          height="16"
   3.226 -          layout="topleft"
   3.227 -          left_pad="5"
   3.228 -          halign="center"
   3.229 -          name="LOD_swap_ll_M2L"
   3.230 -          top_delta="0"
   3.231 -          value="--"
   3.232 -          visible="false"
   3.233 -          width="30" />
   3.234 -        <text
   3.235 -          follows="left|top"
   3.236 -          height="16"
   3.237 -          layout="topleft"
   3.238 -          left_pad="5"
   3.239 -          halign="center"
   3.240 -          name="LOD_swap_fs_M2L"
   3.241 -          top_delta="0"
   3.242 -          value="--"
   3.243 -          visible="false"
   3.244 -          width="30" />
   3.245 -        <text
   3.246 -          follows="left|top"
   3.247 -          height="16"
   3.248 -          layout="topleft"
   3.249 -          left_pad="5"
   3.250 -          halign="center"
   3.251 -          name="LOD_swap_usr_M2L"
   3.252 -          top_delta="0"
   3.253 -          value="--"
   3.254 -          visible="false"
   3.255 -          width="30" />
   3.256 -        <text
   3.257 -          follows="left|top"
   3.258 -          height="16"
   3.259 -          layout="topleft"
   3.260 -          left="125"
   3.261 -          halign="center"
   3.262 -          name="LOD_swap_L2I_label"
   3.263 -          top_pad="3"
   3.264 -          value="Low ↔ Lwst"
   3.265 -          visible="false"
   3.266 -          width="60" />
   3.267 -        <text
   3.268 -         follows="left|top"
   3.269 -         height="16"
   3.270 -         layout="topleft"
   3.271 -         left_pad="5"
   3.272 -         halign="center"
   3.273 -         name="LOD_swap_ll_L2I"
   3.274 -         top_delta="0"
   3.275 -         value="--"
   3.276 -         visible="false"
   3.277 -         width="30" />
   3.278 -        <text
   3.279 -          follows="left|top"
   3.280 -          height="16"
   3.281 -          layout="topleft"
   3.282 -          left_pad="5"
   3.283 -          halign="center"
   3.284 -          name="LOD_swap_fs_L2I"
   3.285 -          top_delta="0"
   3.286 -          value="--"
   3.287 -          visible="false"
   3.288 -          width="30" />
   3.289 -        <text
   3.290 -          follows="left|top"
   3.291 -          height="16"
   3.292 -          layout="topleft"
   3.293 -          left_pad="5"
   3.294 -          halign="center"
   3.295 -          name="LOD_swap_usr_L2I"
   3.296 -          top_delta="0"
   3.297 -          value="--"
   3.298 -          visible="false"
   3.299 -          width="30" />
   3.300 -        <text
   3.301 +         <text
   3.302            name="LODSwapTableDscriptionsText"
   3.303            follows="top|left"
   3.304            layout="topleft"
   3.305 @@ -2852,7 +2717,7 @@
   3.306            top_pad="15"
   3.307            tool_tip="Best practice: Creators should ensure good LOD behaviour for Default settings across all viewers."
   3.308            height="100">
   3.309 -        This table shows the LOD change boundaries in metres from the camera.
   3.310 +          This table shows the LOD change boundaries in metres from the camera.
   3.311          </text>
   3.312          <!-- /FS:Beq end of Mesh info section-->
   3.313          </panel>
     4.1 --- a/indra/newview/skins/starlight/xui/en/floater_tools.xml	Tue Nov 28 21:27:25 2017 +0000
     4.2 +++ b/indra/newview/skins/starlight/xui/en/floater_tools.xml	Thu Nov 30 17:05:57 2017 +0000
     4.3 @@ -2537,87 +2537,31 @@
     4.4          <text
     4.5            follows="left|top"
     4.6            halign="left"
     4.7 -          height="16"
     4.8 +          height="64"
     4.9            layout="topleft"
    4.10            left="125"
    4.11 -          name="high_lod_label"
    4.12 +          name="mesh_lod_label"
    4.13            top_pad="3"
    4.14 -          value="High:"
    4.15            visible="false"
    4.16 -          width="60" />
    4.17 +          width="60" >
    4.18 +High:
    4.19 +Medium:
    4.20 +Low:
    4.21 +Lowest:
    4.22 +        </text>
    4.23 +        <string name="mesh_lod_num_tris_values">
    4.24 +[HIGHTRIS]
    4.25 +[MIDTRIS]
    4.26 +[LOWTRIS]
    4.27 +[LOWESTTRIS]
    4.28 +        </string>
    4.29          <text
    4.30            follows="left|top"
    4.31 -          height="16"
    4.32 +          height="64"
    4.33            layout="topleft"
    4.34            left_pad="10"
    4.35            halign="right"
    4.36 -          name="high_lod_num_tris"
    4.37 -          top_delta="0"
    4.38 -          value="--"
    4.39 -          visible="false"
    4.40 -          width="80" />
    4.41 -        <text
    4.42 -          follows="left|top"
    4.43 -          halign="left"
    4.44 -          height="16"
    4.45 -          layout="topleft"
    4.46 -          left="125"
    4.47 -          name="med_lod_label"
    4.48 -          top_pad="3"
    4.49 -          value="Medium:"
    4.50 -          visible="false"
    4.51 -          width="60" />
    4.52 -        <text
    4.53 -          follows="left|top"
    4.54 -          height="16"
    4.55 -          layout="topleft"
    4.56 -          left_pad="10"
    4.57 -          halign="right"
    4.58 -          name="med_lod_num_tris"
    4.59 -          top_delta="0"
    4.60 -          value="--"
    4.61 -          visible="false"
    4.62 -          width="80" />
    4.63 -        <text
    4.64 -          follows="left|top"
    4.65 -          halign="left"
    4.66 -          height="16"
    4.67 -          layout="topleft"
    4.68 -          left="125"
    4.69 -          name="low_lod_label"
    4.70 -          top_pad="3"
    4.71 -          value="Low:"
    4.72 -          visible="false"
    4.73 -          width="60" />
    4.74 -        <text
    4.75 -          follows="left|top"
    4.76 -          height="16"
    4.77 -          layout="topleft"
    4.78 -          left_pad="10"
    4.79 -          halign="right"
    4.80 -          name="low_lod_num_tris"
    4.81 -          top_delta="0"
    4.82 -          value="--"
    4.83 -          visible="false"
    4.84 -          width="80" />
    4.85 -        <text
    4.86 -          follows="left|top"
    4.87 -          halign="left"
    4.88 -          height="16"
    4.89 -          layout="topleft"
    4.90 -          left="125"
    4.91 -          name="lowest_lod_label"
    4.92 -          top_pad="3"
    4.93 -          value="Lowest:"
    4.94 -          visible="false"
    4.95 -          width="60" />
    4.96 -        <text
    4.97 -          follows="left|top"
    4.98 -          height="16"
    4.99 -          layout="topleft"
   4.100 -          left_pad="10"
   4.101 -          halign="right"
   4.102 -          name="lowest_lod_num_tris"
   4.103 +          name="mesh_lod_num_tris"
   4.104            top_delta="0"
   4.105            value="--"
   4.106            visible="false"
   4.107 @@ -2652,16 +2596,16 @@
   4.108                 value="0" />
   4.109          </combo_box>
   4.110          <text
   4.111 -   follows="left|top"
   4.112 -   height="16"
   4.113 -   layout="topleft"
   4.114 -   halign="left"
   4.115 -   top_pad="16"
   4.116 -   left="125"
   4.117 -   name="ObjectLODbehaviourLabel"
   4.118 -   value="Object LOD behaviour:"
   4.119 -   visible="true"
   4.120 -   width="180"/>
   4.121 +          follows="left|top"
   4.122 +          height="16"
   4.123 +          layout="topleft"
   4.124 +          halign="left"
   4.125 +          top_pad="16"
   4.126 +          left="125"
   4.127 +          name="ObjectLODbehaviourLabel"
   4.128 +          value="Object LOD behaviour:"
   4.129 +          visible="true"
   4.130 +          width="180"/>
   4.131          <text
   4.132            follows="left|top"
   4.133            height="16"
   4.134 @@ -2731,6 +2675,7 @@
   4.135            value="LOD Swap"
   4.136            visible="false"
   4.137            width="60" />
   4.138 +        <string name="ll_lod_tooltip_msg">"Linden Lab Second Life Viewer default ([FACTOR])"</string>
   4.139          <text
   4.140            follows="left|top"
   4.141            height="16"
   4.142 @@ -2739,10 +2684,10 @@
   4.143            halign="center"
   4.144            name="LOD_swap_ll_default"
   4.145            top_delta="0"
   4.146 -          tool_tip="Linden Lab Second Life Viewer default"
   4.147            value="LL"
   4.148            visible="false"
   4.149            width="30" />
   4.150 +        <string name="fs_lod_tooltip_msg">"Firestorm Viewer default ([FACTOR])"</string>
   4.151          <text
   4.152            follows="left|top"
   4.153            height="16"
   4.154 @@ -2750,7 +2695,6 @@
   4.155            left_pad="5"
   4.156            halign="center"
   4.157            name="LOD_swap_fs_default"
   4.158 -          tool_tip="Firestorm default"
   4.159            top_delta="0"
   4.160            value="FS"
   4.161            visible="false"
   4.162 @@ -2770,146 +2714,67 @@
   4.163            width="30" />
   4.164          <text
   4.165            follows="left|top"
   4.166 -          height="16"
   4.167 +          height="50"
   4.168            layout="topleft"
   4.169            left="125"
   4.170 -          halign="center"
   4.171 -          name="LOD_swap_H2M_label"
   4.172 +          halign="left"
   4.173 +          name="LOD_swap_LOD_Change_label"
   4.174            top_pad="3"
   4.175 -          value="High ↔ Med"
   4.176            visible="false"
   4.177 -          width="65" />
   4.178 +          width="65" >
   4.179 +High ↔ Med
   4.180 +Med ↔ Low
   4.181 +Low ↔ Lwst
   4.182 +        </text>
   4.183 +        <string
   4.184 +          name="LODSwapFormatString"
   4.185 +          visible="false">
   4.186 +[HIGH2MED]
   4.187 +[MED2LOW]
   4.188 +[LOW2LOWEST]
   4.189 +        </string>
   4.190          <text
   4.191            follows="left|top"
   4.192 -          height="16"
   4.193 +          height="50"
   4.194            layout="topleft"
   4.195            left_pad="0"
   4.196 -          halign="center"
   4.197 -          name="LOD_swap_ll_H2M"
   4.198 +          halign="right"
   4.199 +          name="LOD_swap_ll_values"
   4.200 +          top_delta="0"
   4.201 +          visible="false"
   4.202 +          width="30" />
   4.203 +        <text
   4.204 +          follows="left|top"
   4.205 +          height="50"
   4.206 +          layout="topleft"
   4.207 +          left_pad="5"
   4.208 +          halign="right"
   4.209 +          name="LOD_swap_fs_values"
   4.210            top_delta="0"
   4.211            value="--"
   4.212            visible="false"
   4.213            width="30" />
   4.214          <text
   4.215            follows="left|top"
   4.216 -          height="16"
   4.217 +          height="50"
   4.218            layout="topleft"
   4.219            left_pad="5"
   4.220 -          halign="center"
   4.221 -          name="LOD_swap_fs_H2M"
   4.222 +          halign="right"
   4.223 +          name="LOD_swap_usr_values"
   4.224            top_delta="0"
   4.225            value="--"
   4.226            visible="false"
   4.227            width="30" />
   4.228          <text
   4.229 -          follows="left|top"
   4.230 -          height="16"
   4.231 -          layout="topleft"
   4.232 -          left_pad="5"
   4.233 -          halign="center"
   4.234 -          name="LOD_swap_usr_H2M"
   4.235 -          top_delta="0"
   4.236 -          value="--"
   4.237 -          visible="false"
   4.238 -          width="30" />
   4.239 -        <text
   4.240 -          follows="left|top"
   4.241 -          height="16"
   4.242 -          layout="topleft"
   4.243 -          left="125"
   4.244 -          halign="center"
   4.245 -          name="LOD_swap_M2L_label"
   4.246 -          top_pad="3"
   4.247 -          value="Med ↔ Low"
   4.248 -          visible="false"
   4.249 -          width="60" />
   4.250 -        <text
   4.251 -          follows="left|top"
   4.252 -          height="16"
   4.253 -          layout="topleft"
   4.254 -          left_pad="5"
   4.255 -          halign="center"
   4.256 -          name="LOD_swap_ll_M2L"
   4.257 -          top_delta="0"
   4.258 -          value="--"
   4.259 -          visible="false"
   4.260 -          width="30" />
   4.261 -        <text
   4.262 -          follows="left|top"
   4.263 -          height="16"
   4.264 -          layout="topleft"
   4.265 -          left_pad="5"
   4.266 -          halign="center"
   4.267 -          name="LOD_swap_fs_M2L"
   4.268 -          top_delta="0"
   4.269 -          value="--"
   4.270 -          visible="false"
   4.271 -          width="30" />
   4.272 -        <text
   4.273 -          follows="left|top"
   4.274 -          height="16"
   4.275 -          layout="topleft"
   4.276 -          left_pad="5"
   4.277 -          halign="center"
   4.278 -          name="LOD_swap_usr_M2L"
   4.279 -          top_delta="0"
   4.280 -          value="--"
   4.281 -          visible="false"
   4.282 -          width="30" />
   4.283 -        <text
   4.284 -          follows="left|top"
   4.285 -          height="16"
   4.286 -          layout="topleft"
   4.287 -          left="125"
   4.288 -          halign="center"
   4.289 -          name="LOD_swap_L2I_label"
   4.290 -          top_pad="3"
   4.291 -          value="Low ↔ Lwst"
   4.292 -          visible="false"
   4.293 -          width="60" />
   4.294 -        <text
   4.295 -         follows="left|top"
   4.296 -         height="16"
   4.297 +         name="LODSwapTableDscriptionsText"
   4.298 +         follows="top|left"
   4.299           layout="topleft"
   4.300 -         left_pad="5"
   4.301 -         halign="center"
   4.302 -         name="LOD_swap_ll_L2I"
   4.303 -         top_delta="0"
   4.304 -         value="--"
   4.305 -         visible="false"
   4.306 -         width="30" />
   4.307 -        <text
   4.308 -          follows="left|top"
   4.309 -          height="16"
   4.310 -          layout="topleft"
   4.311 -          left_pad="5"
   4.312 -          halign="center"
   4.313 -          name="LOD_swap_fs_L2I"
   4.314 -          top_delta="0"
   4.315 -          value="--"
   4.316 -          visible="false"
   4.317 -          width="30" />
   4.318 -        <text
   4.319 -          follows="left|top"
   4.320 -          height="16"
   4.321 -          layout="topleft"
   4.322 -          left_pad="5"
   4.323 -          halign="center"
   4.324 -          name="LOD_swap_usr_L2I"
   4.325 -          top_delta="0"
   4.326 -          value="--"
   4.327 -          visible="false"
   4.328 -          width="30" />
   4.329 -        <text
   4.330 -          name="LODSwapTableDscriptionsText"
   4.331 -          follows="top|left"
   4.332 -          layout="topleft"
   4.333 -          left="125"
   4.334 -          right="-1"
   4.335 -          word_wrap="true"
   4.336 -          top_pad="15"
   4.337 -          tool_tip="Best practice: Creators should ensure good LOD behaviour for Default settings across all viewers."
   4.338 -          height="100">
   4.339 +         left="125"
   4.340 +         right="-1"
   4.341 +         word_wrap="true"
   4.342 +         top_pad="15"
   4.343 +         tool_tip="Best practice: Creators should ensure good LOD behaviour for Default settings across all viewers."
   4.344 +         height="100">
   4.345            This table shows the LOD change boundaries in metres from the camera.
   4.346          </text>
   4.347  
     5.1 --- a/indra/newview/skins/starlightcui/xui/en/floater_tools.xml	Tue Nov 28 21:27:25 2017 +0000
     5.2 +++ b/indra/newview/skins/starlightcui/xui/en/floater_tools.xml	Thu Nov 30 17:05:57 2017 +0000
     5.3 @@ -2537,87 +2537,31 @@
     5.4          <text
     5.5            follows="left|top"
     5.6            halign="left"
     5.7 -          height="16"
     5.8 +          height="64"
     5.9            layout="topleft"
    5.10            left="125"
    5.11 -          name="high_lod_label"
    5.12 +          name="mesh_lod_label"
    5.13            top_pad="3"
    5.14 -          value="High:"
    5.15            visible="false"
    5.16 -          width="60" />
    5.17 +          width="60" >
    5.18 +High:
    5.19 +Medium:
    5.20 +Low:
    5.21 +Lowest:
    5.22 +        </text>
    5.23 +        <string name="mesh_lod_num_tris_values">
    5.24 +[HIGHTRIS]
    5.25 +[MIDTRIS]
    5.26 +[LOWTRIS]
    5.27 +[LOWESTTRIS]
    5.28 +        </string>
    5.29          <text
    5.30            follows="left|top"
    5.31 -          height="16"
    5.32 +          height="64"
    5.33            layout="topleft"
    5.34            left_pad="10"
    5.35            halign="right"
    5.36 -          name="high_lod_num_tris"
    5.37 -          top_delta="0"
    5.38 -          value="--"
    5.39 -          visible="false"
    5.40 -          width="80" />
    5.41 -        <text
    5.42 -          follows="left|top"
    5.43 -          halign="left"
    5.44 -          height="16"
    5.45 -          layout="topleft"
    5.46 -          left="125"
    5.47 -          name="med_lod_label"
    5.48 -          top_pad="3"
    5.49 -          value="Medium:"
    5.50 -          visible="false"
    5.51 -          width="60" />
    5.52 -        <text
    5.53 -          follows="left|top"
    5.54 -          height="16"
    5.55 -          layout="topleft"
    5.56 -          left_pad="10"
    5.57 -          halign="right"
    5.58 -          name="med_lod_num_tris"
    5.59 -          top_delta="0"
    5.60 -          value="--"
    5.61 -          visible="false"
    5.62 -          width="80" />
    5.63 -        <text
    5.64 -          follows="left|top"
    5.65 -          halign="left"
    5.66 -          height="16"
    5.67 -          layout="topleft"
    5.68 -          left="125"
    5.69 -          name="low_lod_label"
    5.70 -          top_pad="3"
    5.71 -          value="Low:"
    5.72 -          visible="false"
    5.73 -          width="60" />
    5.74 -        <text
    5.75 -          follows="left|top"
    5.76 -          height="16"
    5.77 -          layout="topleft"
    5.78 -          left_pad="10"
    5.79 -          halign="right"
    5.80 -          name="low_lod_num_tris"
    5.81 -          top_delta="0"
    5.82 -          value="--"
    5.83 -          visible="false"
    5.84 -          width="80" />
    5.85 -        <text
    5.86 -          follows="left|top"
    5.87 -          halign="left"
    5.88 -          height="16"
    5.89 -          layout="topleft"
    5.90 -          left="125"
    5.91 -          name="lowest_lod_label"
    5.92 -          top_pad="3"
    5.93 -          value="Lowest:"
    5.94 -          visible="false"
    5.95 -          width="60" />
    5.96 -        <text
    5.97 -          follows="left|top"
    5.98 -          height="16"
    5.99 -          layout="topleft"
   5.100 -          left_pad="10"
   5.101 -          halign="right"
   5.102 -          name="lowest_lod_num_tris"
   5.103 +          name="mesh_lod_num_tris"
   5.104            top_delta="0"
   5.105            value="--"
   5.106            visible="false"
   5.107 @@ -2652,16 +2596,16 @@
   5.108                 value="0" />
   5.109          </combo_box>
   5.110          <text
   5.111 -   follows="left|top"
   5.112 -   height="16"
   5.113 -   layout="topleft"
   5.114 -   halign="left"
   5.115 -   top_pad="16"
   5.116 -   left="125"
   5.117 -   name="ObjectLODbehaviourLabel"
   5.118 -   value="Object LOD behaviour:"
   5.119 -   visible="true"
   5.120 -   width="180"/>
   5.121 +          follows="left|top"
   5.122 +          height="16"
   5.123 +          layout="topleft"
   5.124 +          halign="left"
   5.125 +          top_pad="16"
   5.126 +          left="125"
   5.127 +          name="ObjectLODbehaviourLabel"
   5.128 +          value="Object LOD behaviour:"
   5.129 +          visible="true"
   5.130 +          width="180"/>
   5.131          <text
   5.132            follows="left|top"
   5.133            height="16"
   5.134 @@ -2731,6 +2675,7 @@
   5.135            value="LOD Swap"
   5.136            visible="false"
   5.137            width="60" />
   5.138 +        <string name="ll_lod_tooltip_msg">"Linden Lab Second Life Viewer default ([FACTOR])"</string>
   5.139          <text
   5.140            follows="left|top"
   5.141            height="16"
   5.142 @@ -2739,10 +2684,10 @@
   5.143            halign="center"
   5.144            name="LOD_swap_ll_default"
   5.145            top_delta="0"
   5.146 -          tool_tip="Linden Lab Second Life Viewer default"
   5.147            value="LL"
   5.148            visible="false"
   5.149            width="30" />
   5.150 +        <string name="fs_lod_tooltip_msg">"Firestorm Viewer default ([FACTOR])"</string>
   5.151          <text
   5.152            follows="left|top"
   5.153            height="16"
   5.154 @@ -2750,7 +2695,6 @@
   5.155            left_pad="5"
   5.156            halign="center"
   5.157            name="LOD_swap_fs_default"
   5.158 -          tool_tip="Firestorm default"
   5.159            top_delta="0"
   5.160            value="FS"
   5.161            visible="false"
   5.162 @@ -2770,149 +2714,69 @@
   5.163            width="30" />
   5.164          <text
   5.165            follows="left|top"
   5.166 -          height="16"
   5.167 +          height="50"
   5.168            layout="topleft"
   5.169            left="125"
   5.170 -          halign="center"
   5.171 -          name="LOD_swap_H2M_label"
   5.172 +          halign="left"
   5.173 +          name="LOD_swap_LOD_Change_label"
   5.174            top_pad="3"
   5.175 -          value="High ↔ Med"
   5.176            visible="false"
   5.177 -          width="65" />
   5.178 +          width="65" >
   5.179 +High ↔ Med
   5.180 +Med ↔ Low
   5.181 +Low ↔ Lwst
   5.182 +        </text>
   5.183 +        <string
   5.184 +          name="LODSwapFormatString"
   5.185 +          visible="false">
   5.186 +[HIGH2MED]
   5.187 +[MED2LOW]
   5.188 +[LOW2LOWEST]
   5.189 +        </string>
   5.190          <text
   5.191            follows="left|top"
   5.192 -          height="16"
   5.193 +          height="50"
   5.194            layout="topleft"
   5.195            left_pad="0"
   5.196 -          halign="center"
   5.197 -          name="LOD_swap_ll_H2M"
   5.198 +          halign="right"
   5.199 +          name="LOD_swap_ll_values"
   5.200 +          top_delta="0"
   5.201 +          visible="false"
   5.202 +          width="30" />
   5.203 +        <text
   5.204 +          follows="left|top"
   5.205 +          height="50"
   5.206 +          layout="topleft"
   5.207 +          left_pad="5"
   5.208 +          halign="right"
   5.209 +          name="LOD_swap_fs_values"
   5.210            top_delta="0"
   5.211            value="--"
   5.212            visible="false"
   5.213            width="30" />
   5.214          <text
   5.215            follows="left|top"
   5.216 -          height="16"
   5.217 +          height="50"
   5.218            layout="topleft"
   5.219            left_pad="5"
   5.220 -          halign="center"
   5.221 -          name="LOD_swap_fs_H2M"
   5.222 +          halign="right"
   5.223 +          name="LOD_swap_usr_values"
   5.224            top_delta="0"
   5.225            value="--"
   5.226            visible="false"
   5.227            width="30" />
   5.228          <text
   5.229 -          follows="left|top"
   5.230 -          height="16"
   5.231 -          layout="topleft"
   5.232 -          left_pad="5"
   5.233 -          halign="center"
   5.234 -          name="LOD_swap_usr_H2M"
   5.235 -          top_delta="0"
   5.236 -          value="--"
   5.237 -          visible="false"
   5.238 -          width="30" />
   5.239 -        <text
   5.240 -          follows="left|top"
   5.241 -          height="16"
   5.242 -          layout="topleft"
   5.243 -          left="125"
   5.244 -          halign="center"
   5.245 -          name="LOD_swap_M2L_label"
   5.246 -          top_pad="3"
   5.247 -          value="Med ↔ Low"
   5.248 -          visible="false"
   5.249 -          width="60" />
   5.250 -        <text
   5.251 -          follows="left|top"
   5.252 -          height="16"
   5.253 -          layout="topleft"
   5.254 -          left_pad="5"
   5.255 -          halign="center"
   5.256 -          name="LOD_swap_ll_M2L"
   5.257 -          top_delta="0"
   5.258 -          value="--"
   5.259 -          visible="false"
   5.260 -          width="30" />
   5.261 -        <text
   5.262 -          follows="left|top"
   5.263 -          height="16"
   5.264 -          layout="topleft"
   5.265 -          left_pad="5"
   5.266 -          halign="center"
   5.267 -          name="LOD_swap_fs_M2L"
   5.268 -          top_delta="0"
   5.269 -          value="--"
   5.270 -          visible="false"
   5.271 -          width="30" />
   5.272 -        <text
   5.273 -          follows="left|top"
   5.274 -          height="16"
   5.275 -          layout="topleft"
   5.276 -          left_pad="5"
   5.277 -          halign="center"
   5.278 -          name="LOD_swap_usr_M2L"
   5.279 -          top_delta="0"
   5.280 -          value="--"
   5.281 -          visible="false"
   5.282 -          width="30" />
   5.283 -        <text
   5.284 -          follows="left|top"
   5.285 -          height="16"
   5.286 -          layout="topleft"
   5.287 -          left="125"
   5.288 -          halign="center"
   5.289 -          name="LOD_swap_L2I_label"
   5.290 -          top_pad="3"
   5.291 -          value="Low ↔ Lwst"
   5.292 -          visible="false"
   5.293 -          width="60" />
   5.294 -        <text
   5.295 -         follows="left|top"
   5.296 -         height="16"
   5.297 +         name="LODSwapTableDscriptionsText"
   5.298 +         follows="top|left"
   5.299           layout="topleft"
   5.300 -         left_pad="5"
   5.301 -         halign="center"
   5.302 -         name="LOD_swap_ll_L2I"
   5.303 -         top_delta="0"
   5.304 -         value="--"
   5.305 -         visible="false"
   5.306 -         width="30" />
   5.307 -        <text
   5.308 -          follows="left|top"
   5.309 -          height="16"
   5.310 -          layout="topleft"
   5.311 -          left_pad="5"
   5.312 -          halign="center"
   5.313 -          name="LOD_swap_fs_L2I"
   5.314 -          top_delta="0"
   5.315 -          value="--"
   5.316 -          visible="false"
   5.317 -          width="30" />
   5.318 -        <text
   5.319 -          follows="left|top"
   5.320 -          height="16"
   5.321 -          layout="topleft"
   5.322 -          left_pad="5"
   5.323 -          halign="center"
   5.324 -          name="LOD_swap_usr_L2I"
   5.325 -          top_delta="0"
   5.326 -          value="--"
   5.327 -          visible="false"
   5.328 -          width="30" />
   5.329 -        <text
   5.330 -          name="LODSwapTableDscriptionsText"
   5.331 -          follows="top|left"
   5.332 -          layout="topleft"
   5.333 -          left="125"
   5.334 -          right="-1"
   5.335 -          word_wrap="true"
   5.336 -          top_pad="15"
   5.337 -          tool_tip="Best practice: Creators should ensure good LOD behaviour for Default settings across all viewers."
   5.338 -          height="100">
   5.339 +         left="125"
   5.340 +         right="-1"
   5.341 +         word_wrap="true"
   5.342 +         top_pad="15"
   5.343 +         tool_tip="Best practice: Creators should ensure good LOD behaviour for Default settings across all viewers."
   5.344 +         height="100">
   5.345            This table shows the LOD change boundaries in metres from the camera.
   5.346          </text>
   5.347 -
   5.348          <!-- /FS:Beq end of Mesh info section-->
   5.349        </panel>
   5.350          <panel
     6.1 --- a/indra/newview/skins/vintage/xui/en/floater_tools.xml	Tue Nov 28 21:27:25 2017 +0000
     6.2 +++ b/indra/newview/skins/vintage/xui/en/floater_tools.xml	Thu Nov 30 17:05:57 2017 +0000
     6.3 @@ -2471,87 +2471,31 @@
     6.4          <text
     6.5            follows="left|top"
     6.6            halign="left"
     6.7 -          height="16"
     6.8 +          height="64"
     6.9            layout="topleft"
    6.10            left="125"
    6.11 -          name="high_lod_label"
    6.12 +          name="mesh_lod_label"
    6.13            top_pad="3"
    6.14 -          value="High:"
    6.15            visible="false"
    6.16 -          width="60" />
    6.17 +          width="60" >
    6.18 +High:
    6.19 +Medium:
    6.20 +Low:
    6.21 +Lowest:
    6.22 +        </text>
    6.23 +        <string name="mesh_lod_num_tris_values">
    6.24 +[HIGHTRIS]
    6.25 +[MIDTRIS]
    6.26 +[LOWTRIS]
    6.27 +[LOWESTTRIS]
    6.28 +        </string>
    6.29          <text
    6.30            follows="left|top"
    6.31 -          height="16"
    6.32 +          height="64"
    6.33            layout="topleft"
    6.34            left_pad="10"
    6.35            halign="right"
    6.36 -          name="high_lod_num_tris"
    6.37 -          top_delta="0"
    6.38 -          value="--"
    6.39 -          visible="false"
    6.40 -          width="80" />
    6.41 -        <text
    6.42 -          follows="left|top"
    6.43 -          halign="left"
    6.44 -          height="16"
    6.45 -          layout="topleft"
    6.46 -          left="125"
    6.47 -          name="med_lod_label"
    6.48 -          top_pad="3"
    6.49 -          value="Medium:"
    6.50 -          visible="false"
    6.51 -          width="60" />
    6.52 -        <text
    6.53 -          follows="left|top"
    6.54 -          height="16"
    6.55 -          layout="topleft"
    6.56 -          left_pad="10"
    6.57 -          halign="right"
    6.58 -          name="med_lod_num_tris"
    6.59 -          top_delta="0"
    6.60 -          value="--"
    6.61 -          visible="false"
    6.62 -          width="80" />
    6.63 -        <text
    6.64 -          follows="left|top"
    6.65 -          halign="left"
    6.66 -          height="16"
    6.67 -          layout="topleft"
    6.68 -          left="125"
    6.69 -          name="low_lod_label"
    6.70 -          top_pad="3"
    6.71 -          value="Low:"
    6.72 -          visible="false"
    6.73 -          width="60" />
    6.74 -        <text
    6.75 -          follows="left|top"
    6.76 -          height="16"
    6.77 -          layout="topleft"
    6.78 -          left_pad="10"
    6.79 -          halign="right"
    6.80 -          name="low_lod_num_tris"
    6.81 -          top_delta="0"
    6.82 -          value="--"
    6.83 -          visible="false"
    6.84 -          width="80" />
    6.85 -        <text
    6.86 -          follows="left|top"
    6.87 -          halign="left"
    6.88 -          height="16"
    6.89 -          layout="topleft"
    6.90 -          left="125"
    6.91 -          name="lowest_lod_label"
    6.92 -          top_pad="3"
    6.93 -          value="Lowest:"
    6.94 -          visible="false"
    6.95 -          width="60" />
    6.96 -        <text
    6.97 -          follows="left|top"
    6.98 -          height="16"
    6.99 -          layout="topleft"
   6.100 -          left_pad="10"
   6.101 -          halign="right"
   6.102 -          name="lowest_lod_num_tris"
   6.103 +          name="mesh_lod_num_tris"
   6.104            top_delta="0"
   6.105            value="--"
   6.106            visible="false"
   6.107 @@ -2586,16 +2530,16 @@
   6.108                 value="0" />
   6.109          </combo_box>
   6.110          <text
   6.111 -   follows="left|top"
   6.112 -   height="16"
   6.113 -   layout="topleft"
   6.114 -   halign="left"
   6.115 -   top_pad="16"
   6.116 -   left="125"
   6.117 -   name="ObjectLODbehaviourLabel"
   6.118 -   value="Object LOD behaviour:"
   6.119 -   visible="true"
   6.120 -   width="180"/>
   6.121 +          follows="left|top"
   6.122 +          height="16"
   6.123 +          layout="topleft"
   6.124 +          halign="left"
   6.125 +          top_pad="16"
   6.126 +          left="125"
   6.127 +          name="ObjectLODbehaviourLabel"
   6.128 +          value="Object LOD behaviour:"
   6.129 +          visible="true"
   6.130 +          width="180"/>
   6.131          <text
   6.132            follows="left|top"
   6.133            height="16"
   6.134 @@ -2665,6 +2609,7 @@
   6.135            value="LOD Swap"
   6.136            visible="false"
   6.137            width="60" />
   6.138 +        <string name="ll_lod_tooltip_msg">"Linden Lab Second Life Viewer default ([FACTOR])"</string>
   6.139          <text
   6.140            follows="left|top"
   6.141            height="16"
   6.142 @@ -2673,10 +2618,10 @@
   6.143            halign="center"
   6.144            name="LOD_swap_ll_default"
   6.145            top_delta="0"
   6.146 -          tool_tip="Linden Lab Second Life Viewer default"
   6.147            value="LL"
   6.148            visible="false"
   6.149            width="30" />
   6.150 +        <string name="fs_lod_tooltip_msg">"Firestorm Viewer default ([FACTOR])"</string>
   6.151          <text
   6.152            follows="left|top"
   6.153            height="16"
   6.154 @@ -2684,7 +2629,6 @@
   6.155            left_pad="5"
   6.156            halign="center"
   6.157            name="LOD_swap_fs_default"
   6.158 -          tool_tip="Firestorm default"
   6.159            top_delta="0"
   6.160            value="FS"
   6.161            visible="false"
   6.162 @@ -2704,149 +2648,69 @@
   6.163            width="30" />
   6.164          <text
   6.165            follows="left|top"
   6.166 -          height="16"
   6.167 +          height="50"
   6.168            layout="topleft"
   6.169            left="125"
   6.170 -          halign="center"
   6.171 -          name="LOD_swap_H2M_label"
   6.172 +          halign="left"
   6.173 +          name="LOD_swap_LOD_Change_label"
   6.174            top_pad="3"
   6.175 -          value="High ↔ Med"
   6.176            visible="false"
   6.177 -          width="65" />
   6.178 +          width="65" >
   6.179 +High ↔ Med
   6.180 +Med ↔ Low
   6.181 +Low ↔ Lwst
   6.182 +        </text>
   6.183 +        <string
   6.184 +          name="LODSwapFormatString"
   6.185 +          visible="false">
   6.186 +[HIGH2MED]
   6.187 +[MED2LOW]
   6.188 +[LOW2LOWEST]
   6.189 +        </string>
   6.190          <text
   6.191            follows="left|top"
   6.192 -          height="16"
   6.193 +          height="50"
   6.194            layout="topleft"
   6.195            left_pad="0"
   6.196 -          halign="center"
   6.197 -          name="LOD_swap_ll_H2M"
   6.198 +          halign="right"
   6.199 +          name="LOD_swap_ll_values"
   6.200 +          top_delta="0"
   6.201 +          visible="false"
   6.202 +          width="30" />
   6.203 +        <text
   6.204 +          follows="left|top"
   6.205 +          height="50"
   6.206 +          layout="topleft"
   6.207 +          left_pad="5"
   6.208 +          halign="right"
   6.209 +          name="LOD_swap_fs_values"
   6.210            top_delta="0"
   6.211            value="--"
   6.212            visible="false"
   6.213            width="30" />
   6.214          <text
   6.215            follows="left|top"
   6.216 -          height="16"
   6.217 +          height="50"
   6.218            layout="topleft"
   6.219            left_pad="5"
   6.220 -          halign="center"
   6.221 -          name="LOD_swap_fs_H2M"
   6.222 +          halign="right"
   6.223 +          name="LOD_swap_usr_values"
   6.224            top_delta="0"
   6.225            value="--"
   6.226            visible="false"
   6.227            width="30" />
   6.228          <text
   6.229 -          follows="left|top"
   6.230 -          height="16"
   6.231 -          layout="topleft"
   6.232 -          left_pad="5"
   6.233 -          halign="center"
   6.234 -          name="LOD_swap_usr_H2M"
   6.235 -          top_delta="0"
   6.236 -          value="--"
   6.237 -          visible="false"
   6.238 -          width="30" />
   6.239 -        <text
   6.240 -          follows="left|top"
   6.241 -          height="16"
   6.242 -          layout="topleft"
   6.243 -          left="125"
   6.244 -          halign="center"
   6.245 -          name="LOD_swap_M2L_label"
   6.246 -          top_pad="3"
   6.247 -          value="Med ↔ Low"
   6.248 -          visible="false"
   6.249 -          width="60" />
   6.250 -        <text
   6.251 -          follows="left|top"
   6.252 -          height="16"
   6.253 -          layout="topleft"
   6.254 -          left_pad="5"
   6.255 -          halign="center"
   6.256 -          name="LOD_swap_ll_M2L"
   6.257 -          top_delta="0"
   6.258 -          value="--"
   6.259 -          visible="false"
   6.260 -          width="30" />
   6.261 -        <text
   6.262 -          follows="left|top"
   6.263 -          height="16"
   6.264 -          layout="topleft"
   6.265 -          left_pad="5"
   6.266 -          halign="center"
   6.267 -          name="LOD_swap_fs_M2L"
   6.268 -          top_delta="0"
   6.269 -          value="--"
   6.270 -          visible="false"
   6.271 -          width="30" />
   6.272 -        <text
   6.273 -          follows="left|top"
   6.274 -          height="16"
   6.275 -          layout="topleft"
   6.276 -          left_pad="5"
   6.277 -          halign="center"
   6.278 -          name="LOD_swap_usr_M2L"
   6.279 -          top_delta="0"
   6.280 -          value="--"
   6.281 -          visible="false"
   6.282 -          width="30" />
   6.283 -        <text
   6.284 -          follows="left|top"
   6.285 -          height="16"
   6.286 -          layout="topleft"
   6.287 -          left="125"
   6.288 -          halign="center"
   6.289 -          name="LOD_swap_L2I_label"
   6.290 -          top_pad="3"
   6.291 -          value="Low ↔ Lwst"
   6.292 -          visible="false"
   6.293 -          width="60" />
   6.294 -        <text
   6.295 -         follows="left|top"
   6.296 -         height="16"
   6.297 +         name="LODSwapTableDscriptionsText"
   6.298 +         follows="top|left"
   6.299           layout="topleft"
   6.300 -         left_pad="5"
   6.301 -         halign="center"
   6.302 -         name="LOD_swap_ll_L2I"
   6.303 -         top_delta="0"
   6.304 -         value="--"
   6.305 -         visible="false"
   6.306 -         width="30" />
   6.307 -        <text
   6.308 -          follows="left|top"
   6.309 -          height="16"
   6.310 -          layout="topleft"
   6.311 -          left_pad="5"
   6.312 -          halign="center"
   6.313 -          name="LOD_swap_fs_L2I"
   6.314 -          top_delta="0"
   6.315 -          value="--"
   6.316 -          visible="false"
   6.317 -          width="30" />
   6.318 -        <text
   6.319 -          follows="left|top"
   6.320 -          height="16"
   6.321 -          layout="topleft"
   6.322 -          left_pad="5"
   6.323 -          halign="center"
   6.324 -          name="LOD_swap_usr_L2I"
   6.325 -          top_delta="0"
   6.326 -          value="--"
   6.327 -          visible="false"
   6.328 -          width="30" />
   6.329 -        <text
   6.330 -          name="LODSwapTableDscriptionsText"
   6.331 -          follows="top|left"
   6.332 -          layout="topleft"
   6.333 -          left="125"
   6.334 -          right="-1"
   6.335 -          word_wrap="true"
   6.336 -          top_pad="15"
   6.337 -          tool_tip="Best practice: Creators should ensure good LOD behaviour for Default settings across all viewers."
   6.338 -          height="100">
   6.339 +         left="125"
   6.340 +         right="-1"
   6.341 +         word_wrap="true"
   6.342 +         top_pad="15"
   6.343 +         tool_tip="Best practice: Creators should ensure good LOD behaviour for Default settings across all viewers."
   6.344 +         height="100">
   6.345            This table shows the LOD change boundaries in metres from the camera.
   6.346          </text>
   6.347 -
   6.348          <!-- /FS:Beq end of Mesh info section-->
   6.349  
   6.350        </panel>

mercurial