Turn off Viewer tags by deafult, add notice to Tags tab of Phoenix preferences.

Fri, 02 Mar 2012 23:38:56 -0800

author
Tank_Master
date
Fri, 02 Mar 2012 23:38:56 -0800
changeset 1653
a5a27688b9d7
parent 1652
336897afac6c
child 1654
839c2ca53e6b
child 1656
e35ea7a9106e

Turn off Viewer tags by deafult, add notice to Tags tab of Phoenix preferences.

indra/newview/app_settings/settings.xml file | annotate | diff | revisions
indra/newview/llpanelphoenix.cpp file | annotate | diff | revisions
indra/newview/llvoavatar.cpp file | annotate | diff | revisions
indra/newview/llvoavatar.h file | annotate | diff | revisions
indra/newview/skins/default/xui/en-us/panel_preferences_phoenix.xml file | annotate | diff | revisions
     1.1 --- a/indra/newview/app_settings/settings.xml	Wed Feb 29 08:31:58 2012 -0800
     1.2 +++ b/indra/newview/app_settings/settings.xml	Fri Mar 02 23:38:56 2012 -0800
     1.3 @@ -8126,7 +8126,7 @@
     1.4  			<key>Value</key>
     1.5  			<real>1.0</real>
     1.6  		</map>
     1.7 -		<key>PhoenixClientTagDisplay</key>
     1.8 +		<key>PhoenixClientTagDisplay2</key>
     1.9  		<map>
    1.10  			<key>Comment</key>
    1.11  			<string>Whether or not to change tag color based on client</string>
    1.12 @@ -8135,9 +8135,9 @@
    1.13  			<key>Type</key>
    1.14  			<string>Boolean</string>
    1.15  			<key>Value</key>
    1.16 -			<integer>1</integer>
    1.17 -		</map>
    1.18 -		<key>PhoenixClientTagsVisibility</key>
    1.19 +			<integer>0</integer>
    1.20 +		</map>
    1.21 +		<key>PhoenixClientTagsVisibility2</key>
    1.22  		<map>
    1.23  			<key>Comment</key>
    1.24  			<string>Show clienttags: 0=Clienttags Off, 1=That are on the TPVD (needs FSUseLegacyClienttags), 2=That are on the client_tag.xml (needs FSUseLegacyClienttags), 3=That using the new system</string>
    1.25 @@ -8146,7 +8146,7 @@
    1.26  			<key>Type</key>
    1.27  			<string>U32</string>
    1.28  			<key>Value</key>
    1.29 -			<integer>1</integer>
    1.30 +			<integer>0</integer>
    1.31  		</map>
    1.32  		<key>PhoenixCmdLine</key>
    1.33  		<map>
     2.1 --- a/indra/newview/llpanelphoenix.cpp	Wed Feb 29 08:31:58 2012 -0800
     2.2 +++ b/indra/newview/llpanelphoenix.cpp	Fri Mar 02 23:38:56 2012 -0800
     2.3 @@ -420,7 +420,7 @@
     2.4  	}
     2.5  
     2.6      //HACK* Because apparently LLComboBox doesnt set the saved value initially, do it manually here -KC
     2.7 -	getChild<LLComboBox>("PhoenixClientTagsVisibility")->setCurrentByIndex(gSavedSettings.getU32("PhoenixClientTagsVisibility"));
     2.8 +	getChild<LLComboBox>("PhoenixClientTagsVisibility2")->setCurrentByIndex(gSavedSettings.getU32("PhoenixClientTagsVisibility2"));
     2.9  	getChild<LLComboBox>("PhoenixColorClienttags")->setCurrentByIndex(gSavedSettings.getU32("PhoenixColorClientTags"));
    2.10      
    2.11  	refresh();
     3.1 --- a/indra/newview/llvoavatar.cpp	Wed Feb 29 08:31:58 2012 -0800
     3.2 +++ b/indra/newview/llvoavatar.cpp	Fri Mar 02 23:38:56 2012 -0800
     3.3 @@ -3460,7 +3460,7 @@
     3.4      // 1 = TPVD only
     3.5      // 2 = Any known
     3.6      // 3 = Any
     3.7 -	static LLCachedControl<U32> sPhoenixClientTagsVisibility(gSavedSettings, "PhoenixClientTagsVisibility");
     3.8 +	static LLCachedControl<U32> sPhoenixClientTagsVisibility2(gSavedSettings, "PhoenixClientTagsVisibility2");
     3.9  
    3.10      // Tag color visibility setting
    3.11      // 0 = Off
    3.12 @@ -3634,7 +3634,7 @@
    3.13      }
    3.14  
    3.15  	// If the tag is going to be visiable, force the name tag to rebuild
    3.16 -	if (sPhoenixClientTagsVisibility >= mClientTagType)
    3.17 +	if (sPhoenixClientTagsVisibility2 >= mClientTagType)
    3.18  	{
    3.19  		//WS: Clear mNameString to force a rebuild
    3.20  		mNameString.clear();
    3.21 @@ -3796,14 +3796,14 @@
    3.22  	bool is_cloud = getIsCloud();
    3.23  
    3.24  	static LLCachedControl<LLColor4U> sAvatarNameColor(gColors, "AvatarNameColor");
    3.25 -	static LLCachedControl<bool> sPhoenixClientTagDisplay(gSavedSettings, "PhoenixClientTagDisplay");
    3.26 -	static LLCachedControl<U32> sPhoenixClientTagsVisibility(gSavedSettings, "PhoenixClientTagsVisibility");
    3.27 +	static LLCachedControl<bool> sPhoenixClientTagDisplay2(gSavedSettings, "PhoenixClientTagDisplay2");
    3.28 +	static LLCachedControl<U32> sPhoenixClientTagsVisibility2(gSavedSettings, "PhoenixClientTagsVisibility2");
    3.29  	static LLCachedControl<U32> sPhoenixColorClientTags(gSavedSettings, "PhoenixColorClientTags");
    3.30  	static LLCachedControl<bool> sPhoenixShowOwnClientColor(gSavedSettings, "PhoenixShowOwnClientColor");
    3.31 -	const bool should_show_client_tag = sPhoenixClientTagDisplay
    3.32 +	const bool should_show_client_tag = sPhoenixClientTagDisplay2
    3.33                                           && !mClientTagName.empty()
    3.34                                           && (mClientTagType > 0)
    3.35 -                                         && (sPhoenixClientTagsVisibility >= mClientTagType);
    3.36 +                                         && (sPhoenixClientTagsVisibility2 >= mClientTagType);
    3.37  
    3.38  	LLColor4 name_tag_color = (LLColor4)sAvatarNameColor;
    3.39  
     4.1 --- a/indra/newview/llvoavatar.h	Wed Feb 29 08:31:58 2012 -0800
     4.2 +++ b/indra/newview/llvoavatar.h	Fri Mar 02 23:38:56 2012 -0800
     4.3 @@ -736,7 +736,7 @@
     4.4  	LLFrameTimer mRegionCrossingTimer;
     4.5  	S32		  mRegionCrossingCount;
     4.6  
     4.7 -    // The values for this enumerations are aligned to PhoenixClientTagsVisibility
     4.8 +    // The values for this enumerations are aligned to PhoenixClientTagsVisibility2
     4.9      enum  e_tagtype {
    4.10          TT_NONE = 0,
    4.11          TT_TPVD = 1,
     5.1 --- a/indra/newview/skins/default/xui/en-us/panel_preferences_phoenix.xml	Wed Feb 29 08:31:58 2012 -0800
     5.2 +++ b/indra/newview/skins/default/xui/en-us/panel_preferences_phoenix.xml	Fri Mar 02 23:38:56 2012 -0800
     5.3 @@ -293,10 +293,11 @@
     5.4  	  <!--Tags-->
     5.5  	  <panel border="true" bottom="-440" follows="left|top|right|bottom" height="440" label="Tags" left="1" mouse_opaque="true" name="Tags" width="517">
     5.6          <button bottom="-25" follows="left|top" font="SansSerifSmall" height="18" label="?" name="PhoenixHelp_TeleportLogin" tool_tip="Click here for help regarding the settings in this page." right="490" width="18"/>
     5.7 -		<text bottom="-30" follows="left|top" font="SansSerifSmall" height="16" left="10" name="tag_text" width="300">Phoenix Tag Color</text>
     5.8 +      <text bottom="-30" follows="left|top" font="SansSerifSmall" height="16" left="10" name="tag_text" width="512">Note: Do to changes Linden Lab has made, viewer tags will not work in Second Life.</text>
     5.9 +      <text bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16" left="10" name="tag_text" width="300">Phoenix Tag Color</text>
    5.10          <combo_box name="TagCombo" bottom_delta="-20" left_delta="0" follows="left|top" height="18" width="180" max_chars="128" mouse_opaque="true" tool_tip="Client tag color." />
    5.11          <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16" initial_value="false" label="Show your own color" left_delta="0" mouse_opaque="true" name="PhShowOwnClientColor-toggle" control_name="PhoenixShowOwnClientColor" radio_style="false" width="270" tool_tip="When checked, your Tag will be shown in the given color."/>
    5.12 -        <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16" initial_value="false" label="Display Client Tags" left_delta="-0" mouse_opaque="true" name="DisplayTags_toggle" radio_style="false" width="270" control_name="PhoenixClientTagDisplay" tool_tip="Shows you what client people are using beside their names. (If their client is identifiable) "/>
    5.13 +        <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16" initial_value="false" label="Display Client Tags" left_delta="-0" mouse_opaque="true" name="DisplayTags_toggle" radio_style="false" width="270" control_name="PhoenixClientTagDisplay2" tool_tip="Shows you what client people are using beside their names. (If their client is identifiable) "/>
    5.14  <!--
    5.15           <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16" initial_value="false" label="Color Name Tags" left_delta="-0" mouse_opaque="true" name="ColorTags_toggle" radio_style="false" width="270" control_name="PhoenixChangeColorOnClient" tool_tip="Displays their tag in colors."/>
    5.16         <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16" initial_value="false" label="Make name Tags of the same client be the same color (one color per viewer)" left_delta="-0" mouse_opaque="true" name="ColorTagsClient_toggle" radio_style="false" width="270" control_name="PhoenixDontUseMultipleColorTags" tool_tip="Displays their tag in colors depending on client they are using."/>
    5.17 @@ -321,8 +322,8 @@
    5.18           max_chars="135"
    5.19           width="220"
    5.20           allow_text_entry="false"
    5.21 -         control_name="PhoenixClientTagsVisibility"
    5.22 -         name="PhoenixClientTagsVisibility">
    5.23 +         control_name="PhoenixClientTagsVisibility2"
    5.24 +         name="PhoenixClientTagsVisibility2">
    5.25            <combo_item name="No Viewertags" value="0">No Viewertags</combo_item>
    5.26            <combo_item name="TPVD Viewer" value="1">TPVD Viewers (using a list)</combo_item>
    5.27            <combo_item name="All known Viewers" value="2">All known Viewers (using a list)</combo_item>

mercurial