From cf675c37482ad510de5b07a89429f65198b62e8d Mon Sep 17 00:00:00 2001
From: Lirusaito <inusaito@gmail.com>
Date: Fri, 14 Jun 2013 22:04:27 -0400
Subject: [PATCH] Feature Request (from IRC): Add option to display complete
 name on profile (Available on Vanity Preferences at the bottom of the main
 tab)

Note: This will not work with legacy names selected because that disables the display name system altogether right now, if we ever separate the disabling to another setting, this would work.
---
 indra/newview/app_settings/settings_ascent.xml        | 11 +++++++++++
 indra/newview/ascentprefsvan.cpp                      |  2 ++
 indra/newview/ascentprefsvan.h                        |  1 +
 indra/newview/llpanelavatar.cpp                       |  5 ++++-
 .../xui/en-us/panel_preferences_ascent_vanity.xml     |  1 +
 5 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/indra/newview/app_settings/settings_ascent.xml b/indra/newview/app_settings/settings_ascent.xml
index dd8d4e606..57f972799 100644
--- a/indra/newview/app_settings/settings_ascent.xml
+++ b/indra/newview/app_settings/settings_ascent.xml
@@ -620,5 +620,16 @@
 			<key>Value</key>
 			<string>/away</string>
 		</map>
+		<key>SinguCompleteNameProfiles</key>
+		<map>
+			<key>Comment</key>
+			<string>Use the complete name "Display Name (legacy.name)" in profiles, instead of following the choice set by PhoenixNameSystem.</string>
+			<key>Persist</key>
+			<integer>1</integer>
+			<key>Type</key>
+			<string>Boolean</string>
+			<key>Value</key>
+			<boolean>0</boolean>
+		</map>
     </map>
 </llsd>
diff --git a/indra/newview/ascentprefsvan.cpp b/indra/newview/ascentprefsvan.cpp
index 9802144ec..7d8de21ea 100644
--- a/indra/newview/ascentprefsvan.cpp
+++ b/indra/newview/ascentprefsvan.cpp
@@ -192,6 +192,7 @@ void LLPrefsAscentVan::refreshValues()
 	mAnnounceSnapshots = gSavedSettings.getBOOL("AnnounceSnapshots");
 	mAnnounceStreamMetadata = gSavedSettings.getBOOL("AnnounceStreamMetadata");
 	mUnfocusedFloatersOpaque = gSavedSettings.getBOOL("FloaterUnfocusedBackgroundOpaque");
+	mCompleteNameProfiles   = gSavedSettings.getBOOL("SinguCompleteNameProfiles");
 
     //Tags\Colors ----------------------------------------------------------------------------
     mAscentBroadcastTag     = gSavedSettings.getBOOL("AscentBroadcastTag");
@@ -261,6 +262,7 @@ void LLPrefsAscentVan::cancel()
 	gSavedSettings.setBOOL("AnnounceSnapshots", mAnnounceSnapshots);
 	gSavedSettings.setBOOL("AnnounceStreamMetadata", mAnnounceStreamMetadata);
 	gSavedSettings.setBOOL("FloaterUnfocusedBackgroundOpaque", mUnfocusedFloatersOpaque);
+	gSavedSettings.setBOOL("SinguCompleteNameProfiles",     mCompleteNameProfiles);
 
     //Tags\Colors ----------------------------------------------------------------------------
     gSavedSettings.setBOOL("AscentBroadcastTag",         mAscentBroadcastTag);
diff --git a/indra/newview/ascentprefsvan.h b/indra/newview/ascentprefsvan.h
index 78984b3c5..b9eaa18e4 100644
--- a/indra/newview/ascentprefsvan.h
+++ b/indra/newview/ascentprefsvan.h
@@ -63,6 +63,7 @@ protected:
 	bool mAnnounceSnapshots;
 	bool mAnnounceStreamMetadata;
 	bool mUnfocusedFloatersOpaque;
+	bool mCompleteNameProfiles;
     //Tags\Colors
     BOOL mAscentBroadcastTag;
     std::string mReportClientUUID;
diff --git a/indra/newview/llpanelavatar.cpp b/indra/newview/llpanelavatar.cpp
index 524de0fb0..3915aab8f 100644
--- a/indra/newview/llpanelavatar.cpp
+++ b/indra/newview/llpanelavatar.cpp
@@ -1514,7 +1514,10 @@ void LLPanelAvatar::setOnlineStatus(EOnlineStatus online_status)
 void LLPanelAvatar::onAvatarNameResponse(const LLUUID& agent_id, const LLAvatarName& av_name)
 {
 	std::string name;
-	LLAvatarNameCache::getPNSName(av_name, name);
+	if (gSavedSettings.getBOOL("SinguCompleteNameProfiles"))
+		name = av_name.getCompleteName();
+	else
+		LLAvatarNameCache::getPNSName(av_name, name);
 	getChild<LLLineEditor>("dnname")->setText(name);
 }
 
diff --git a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_vanity.xml b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_vanity.xml
index f38cc9632..531da05a5 100644
--- a/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_vanity.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_preferences_ascent_vanity.xml
@@ -12,6 +12,7 @@
       <check_box bottom_delta="-20" control_name="AnnounceSnapshots" follows="top" height="16" label="Announce when someone takes a snapshot" tool_tip="Won't announce for people who hide the fact that they are taking a snapshot." name="announce_snapshots"/>
       <check_box bottom_delta="-20" control_name="AnnounceStreamMetadata" follows="top" height="16" label="Announce music stream's metadata in local chat when tuned in" tool_tip="When a new song comes on, a message will be displayed in local chat with available information about the track." name="announce_stream_metadata"/>
       <check_box bottom_delta="-20" control_name="FloaterUnfocusedBackgroundOpaque" follows="top" height="16" label="Make unfocused floaters opaque (requires refocusing each floater to take effect)" tool_tip="When a floater loses focus, it won't turn transparent with this enabled.  This may conflict with some skins." name="unfocused_floaters_opaque"/>
+      <check_box bottom_delta="-20" control_name="SinguCompleteNameProfiles" follows="top" height="16" label="Show complete names (display name and username) in profiles" tool_tip="Disregards the global name display settings, will not work if display names are switched off." name="complete_name_profiles"/>
     </panel>
     <panel border="true" left="1" bottom="-190" height="180" width="500" label="Tags/Colors" name="TagsColors">
       <!-- Client tag options -->