Properly disabled namtag options that only affects the actual nametag in preferences -> General

indra/newview/llfloaterpreference.cpp

@@ -684,10 +684,10 @@ BOOL LLFloaterPreference::postBuild()
 	//getChild<LLComboBox>("ObjectIMOptions")->setCommitCallback(boost::bind(&LLFloaterPreference::onNotificationsChange, this,"ObjectIMOptions"));
 	// </FS:CR>
 	
-// ## Zi: Optional Edit Appearance Lighting
+	// <FS:Zi> Optional Edit Appearance Lighting
 	gSavedSettings.getControl("AppearanceCameraMovement")->getCommitSignal()->connect(boost::bind(&LLFloaterPreference::onAppearanceCameraChanged, this));
 	onAppearanceCameraChanged();
-// ## Zi: Optional Edit Appearance Lighting
+	// </FS:Zi> Optional Edit Appearance Lighting
 
 
 	// if floater is opened before login set default localized do not disturb message
@@ -740,11 +740,11 @@ BOOL LLFloaterPreference::postBuild()
 #endif  // OPENSIM // <FS:AW optional opensim support/>
 
 
-// ## Zi: Pie menu
+	// <FS:Zi> Pie menu
 	gSavedSettings.getControl("OverridePieColors")->getSignal()->connect(boost::bind(&LLFloaterPreference::onPieColorsOverrideChanged, this));
 	// make sure pie color controls are enabled or greyed out properly
 	onPieColorsOverrideChanged();
-// ## Zi: Pie menu
+	// </FS:Zi> Pie menu
 
 	// <FS:Ansariel> Show email address in preferences (FIRE-1071)
 	getChild<LLCheckBoxCtrl>("send_im_to_email")->setLabelArg("[EMAIL]", getString("LoginToChange"));
@@ -762,6 +762,12 @@ BOOL LLFloaterPreference::postBuild()
 	gSavedSettings.getControl("IndirectMaxNonImpostors")->getCommitSignal()->connect(boost::bind(&LLFloaterPreference::updateMaxNonImpostorsLabel, this, _2));
 	gSavedSettings.getControl("RenderAvatarMaxComplexity")->getCommitSignal()->connect(boost::bind(&LLFloaterPreference::updateMaxComplexityLabel, this, _2));
 
+	// <FS:Ansariel> Properly disable avatar tag setting
+	gSavedSettings.getControl("NameTagShowUsernames")->getCommitSignal()->connect(boost::bind(&LLFloaterPreference::onAvatarTagSettingsChanged, this));
+	gSavedSettings.getControl("FSNameTagShowLegacyUsernames")->getCommitSignal()->connect(boost::bind(&LLFloaterPreference::onAvatarTagSettingsChanged, this));
+	onAvatarTagSettingsChanged();
+	// </FS:Ansariel>
+
 	return TRUE;
 }
 
@@ -3374,6 +3380,18 @@ void LLFloaterPreference::saveGraphicsPreset(const std::string& preset)
 	mSavedGraphicsPreset = preset;
 }
 
+
+// <FS:Ansariel> Properly disable avatar tag setting
+void LLFloaterPreference::onAvatarTagSettingsChanged()
+{
+	bool usernames_enabled = gSavedSettings.getBOOL("NameTagShowUsernames");
+	bool legacy_enabled = gSavedSettings.getBOOL("FSNameTagShowLegacyUsernames");
+
+	childSetEnabled("FSshow_legacyun", usernames_enabled);
+	childSetEnabled("legacy_trim_check", usernames_enabled && legacy_enabled);
+}
+// </FS:Ansariel>
+
 //------------------------------Updater---------------------------------------
 
 //<FS:HG> FIRE-6340, FIRE-6567 - Setting Bandwidth issues

indra/newview/llfloaterpreference.h

@@ -161,6 +161,9 @@ protected:
 	void loadFontPresetsFromDir(const std::string& dir, LLComboBox* font_selection_combo);
 	//</FS:Kadah>
 
+	// <FS:Ansariel> Properly disable avatar tag setting
+	void onAvatarTagSettingsChanged();
+
 public:
 	// This function squirrels away the current values of the controls so that
 	// cancel() can restore them.	

indra/newview/skins/default/xui/en/panel_preferences_general.xml

@@ -334,7 +334,6 @@
 	 tool_tip="" />
     <check_box
      control_name="NameTagShowUsernames"
-     enabled_control="AvatarNameTagMode"
      height="16"
      label="Usernames"
      layout="topleft"
@@ -367,7 +366,6 @@
 
     <check_box
      control_name="UseDisplayNames"
-     enabled_control="AvatarNameTagMode"
      follows="top|left"
      height="16"
      label="View Display Names"
@@ -379,7 +377,6 @@
      top_pad="3"/>
    <check_box
      control_name="FSNameTagShowLegacyUsernames"
-     enabled_control="NameTagShowUsernames"
      height="16"
      label="Legacy names instead of usernames"
      layout="topleft"