From 424cf142a4512de878cae37021b08132d12ae489 Mon Sep 17 00:00:00 2001 From: Armin Weatherwax Date: Tue, 25 Jan 2011 23:17:51 +0100 Subject: Add an UI for Display name settings to prefs general, make the setting more intuitive instead: of 0 legacy only , 1 both and 2 display names only we use now: 0 legacy, 1 display names only and 2 both --- linden/indra/llmessage/llavatarnamecache.cpp | 2 +- linden/indra/newview/app_settings/settings.xml | 4 +- linden/indra/newview/llcallingcard.cpp | 2 +- linden/indra/newview/llfloaterfriends.cpp | 4 +- linden/indra/newview/llhoverview.cpp | 2 +- linden/indra/newview/llimpanel.cpp | 4 +- linden/indra/newview/llnamelistctrl.cpp | 2 +- linden/indra/newview/llnetmap.cpp | 2 +- linden/indra/newview/llpanelgeneral.cpp | 5 + linden/indra/newview/llpanelgeneral.h | 3 + linden/indra/newview/llviewermessage.cpp | 2 +- linden/indra/newview/llvoavatar.cpp | 2 +- .../xui/en-us/panel_preferences_general.xml | 147 ++++++++++++--------- 13 files changed, 107 insertions(+), 74 deletions(-) (limited to 'linden/indra') diff --git a/linden/indra/llmessage/llavatarnamecache.cpp b/linden/indra/llmessage/llavatarnamecache.cpp index 45048e1..180274e 100644 --- a/linden/indra/llmessage/llavatarnamecache.cpp +++ b/linden/indra/llmessage/llavatarnamecache.cpp @@ -715,7 +715,7 @@ void LLAvatarNameCache::setUseDisplayNames(U32 use) { if (use > 2) { - sUseDisplayNames = 1; + sUseDisplayNames = 2; } else { diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml index d0db713..7ab3612 100644 --- a/linden/indra/newview/app_settings/settings.xml +++ b/linden/indra/newview/app_settings/settings.xml @@ -424,13 +424,13 @@ DisplayNamesUsage Comment - Usage type for display names: 0 = Legacy name only, 1 = Display name with legacy name, 2 = display name only (legacy name when absent) + Usage type for display names: 0 = Legacy name only, 1 = display name only (legacy name when absent), 2 = Display name with legacy name Persist 1 Type U32 Value - 1 + 2 OmitResidentAsLastName diff --git a/linden/indra/newview/llcallingcard.cpp b/linden/indra/newview/llcallingcard.cpp index 31d7bec..f1328be 100644 --- a/linden/indra/newview/llcallingcard.cpp +++ b/linden/indra/newview/llcallingcard.cpp @@ -693,7 +693,7 @@ void LLAvatarTracker::processNotify(LLMessageSystem* msg, bool online) LLAvatarName avatar_name; if (LLAvatarNameCache::get(agent_id, &avatar_name)) { - if (LLAvatarNameCache::useDisplayNames() == 2) + if (LLAvatarNameCache::useDisplayNames() == 1) { first = avatar_name.mDisplayName; } diff --git a/linden/indra/newview/llfloaterfriends.cpp b/linden/indra/newview/llfloaterfriends.cpp index d3fd9b9..84ba81e 100644 --- a/linden/indra/newview/llfloaterfriends.cpp +++ b/linden/indra/newview/llfloaterfriends.cpp @@ -262,7 +262,7 @@ BOOL LLPanelFriends::addFriend(const LLUUID& agent_id) LLAvatarName avatar_name; if (LLAvatarNameCache::get(agent_id, &avatar_name)) { - if (LLAvatarNameCache::useDisplayNames() == 2) + if (LLAvatarNameCache::useDisplayNames() == 1) { fullname = avatar_name.mDisplayName; } @@ -358,7 +358,7 @@ BOOL LLPanelFriends::updateFriendItem(const LLUUID& agent_id, const LLRelationsh LLAvatarName avatar_name; if (LLAvatarNameCache::get(agent_id, &avatar_name)) { - if (LLAvatarNameCache::useDisplayNames() == 2) + if (LLAvatarNameCache::useDisplayNames() == 1) { fullname = avatar_name.mDisplayName; } diff --git a/linden/indra/newview/llhoverview.cpp b/linden/indra/newview/llhoverview.cpp index e8d8428..4f248e4 100644 --- a/linden/indra/newview/llhoverview.cpp +++ b/linden/indra/newview/llhoverview.cpp @@ -262,7 +262,7 @@ void LLHoverView::updateText() LLAvatarName avatar_name; if (LLAvatarNameCache::get(hit_object->getID(), &avatar_name)) { - if (LLAvatarNameCache::useDisplayNames() == 2) + if (LLAvatarNameCache::useDisplayNames() == 1) { complete_name = avatar_name.mDisplayName; } diff --git a/linden/indra/newview/llimpanel.cpp b/linden/indra/newview/llimpanel.cpp index 54e9bab..a3e917f 100644 --- a/linden/indra/newview/llimpanel.cpp +++ b/linden/indra/newview/llimpanel.cpp @@ -1639,7 +1639,7 @@ void LLFloaterIMPanel::addHistoryLine(const std::string &utf8msg, const LLColor4 LLAvatarName avatar_name; if (LLAvatarNameCache::get(source, &avatar_name)) { - if (LLAvatarNameCache::useDisplayNames() == 2) + if (LLAvatarNameCache::useDisplayNames() == 1) { name = avatar_name.mDisplayName; } @@ -2220,7 +2220,7 @@ void LLFloaterIMPanel::sendMsg() LLAvatarName avatar_name; if (LLAvatarNameCache::get(gAgent.getID(), &avatar_name)) { - if (LLAvatarNameCache::useDisplayNames() == 2) + if (LLAvatarNameCache::useDisplayNames() == 1) { history_echo = avatar_name.mDisplayName; } diff --git a/linden/indra/newview/llnamelistctrl.cpp b/linden/indra/newview/llnamelistctrl.cpp index 8b268c5..e30c129 100644 --- a/linden/indra/newview/llnamelistctrl.cpp +++ b/linden/indra/newview/llnamelistctrl.cpp @@ -475,7 +475,7 @@ bool LLNameListCtrl::getResidentName(const LLUUID& agent_id, std::string& fullna LLAvatarName avatar_name; if (LLAvatarNameCache::get(agent_id, &avatar_name)) { - if (LLAvatarNameCache::useDisplayNames() == 2) + if (LLAvatarNameCache::useDisplayNames() == 1) { fullname = avatar_name.mDisplayName; } diff --git a/linden/indra/newview/llnetmap.cpp b/linden/indra/newview/llnetmap.cpp index 438478f..06257f0 100644 --- a/linden/indra/newview/llnetmap.cpp +++ b/linden/indra/newview/llnetmap.cpp @@ -652,7 +652,7 @@ BOOL LLNetMap::handleToolTip( S32 x, S32 y, std::string& msg, LLRect* sticky_rec if (LLAvatarNameCache::get(mClosestAgentToCursor, &avatar_name)) { result = TRUE; - if (LLAvatarNameCache::useDisplayNames() == 2) + if (LLAvatarNameCache::useDisplayNames() == 1) { fullname = avatar_name.mDisplayName; } diff --git a/linden/indra/newview/llpanelgeneral.cpp b/linden/indra/newview/llpanelgeneral.cpp index fc6073a..70146ce 100644 --- a/linden/indra/newview/llpanelgeneral.cpp +++ b/linden/indra/newview/llpanelgeneral.cpp @@ -98,6 +98,9 @@ BOOL LLPanelGeneral::postBuild() childSetValue("mini_map_notify_chat", gSavedSettings.getBOOL("MiniMapNotifyChatRange")); childSetValue("mini_map_notify_sim", gSavedSettings.getBOOL("MiniMapNotifySimRange")); +// mDisplayNamesUsage = gSavedSettings.getU32("DisplayNamesUsage"); +// mLegacyNamesForFriends = gSavedSettings.getBOOL("LegacyNamesForFriends"); + getChild("effect_color_swatch")->set(gSavedSettings.getColor4("EffectColor")); childSetValue("ui_scale_slider", gSavedSettings.getF32("UIScaleFactor")); @@ -210,6 +213,8 @@ void LLPanelGeneral::apply() void LLPanelGeneral::cancel() { +// gSavedSettings.setU32("DisplayNamesUsage", mDisplayNamesUsage); +// gSavedSettings.setBOOL("LegacyNamesForFriends", mDisplayNamesUsage); } // static diff --git a/linden/indra/newview/llpanelgeneral.h b/linden/indra/newview/llpanelgeneral.h index e85fdf8..56cc3de 100644 --- a/linden/indra/newview/llpanelgeneral.h +++ b/linden/indra/newview/llpanelgeneral.h @@ -51,6 +51,9 @@ private: static void onClickResetUISize(void*); static void onClickGrid(void*); static void onLocationChanged(LLUICtrl* ctrl, void* data); + + U32 mDisplayNamesUsage; + bool mLegacyNamesForFriends; }; #endif diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp index 8cb154e..9ebfd04 100755 --- a/linden/indra/newview/llviewermessage.cpp +++ b/linden/indra/newview/llviewermessage.cpp @@ -3009,7 +3009,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data) LLAvatarName avatar_name; if (LLAvatarNameCache::get(from_id, &avatar_name)) { - if (LLAvatarNameCache::useDisplayNames() == 2) + if (LLAvatarNameCache::useDisplayNames() == 1) { from_name = avatar_name.mDisplayName; } diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp index a3222df..d68c587 100644 --- a/linden/indra/newview/llvoavatar.cpp +++ b/linden/indra/newview/llvoavatar.cpp @@ -3629,7 +3629,7 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last) LLAvatarName avatar_name; if (LLAvatarNameCache::get(getID(), &avatar_name)) { - if (LLAvatarNameCache::useDisplayNames() == 2) + if (LLAvatarNameCache::useDisplayNames() == 1) { complete_name = avatar_name.mDisplayName; } diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml index 4b0b292..6ced7d6 100644 --- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml +++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_general.xml @@ -2,6 +2,15 @@ + + Start Location: + + + <Type region name> + - + Nametags: + + Never show @@ -44,11 +59,35 @@ font="SansSerifSmall" height="16" initial_value="false" label="Hide my name on my screen" left="151" name="show_my_name_checkbox" width="200" /> + + Display Names: + + + + Legacy Names + + + Display Names + + + Show Both + + + + Group Titles: @@ -61,37 +100,49 @@ font="SansSerifSmall" height="16" initial_value="false" label="Hide my group title" left="330" name="show_my_title_checkbox" radio_style="false" width="256" /> - + Selection Beam Color: + + + tool_tip="Click to open Color Picker" width="45" /> UI Size: - -