Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

IRC Feature Request: Ability to show only legacy names for speakers (in Adv. Chat->Chat UI preferences)

Browse Source
This commit is contained in:
Inusaito Sayori
2013-08-15 00:06:09 -04:00
parent 0b9f14fff7
commit a5705bd459
5 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/app_settings/settings.xml
View File

@@ -718,6 +718,17 @@
<key>Value</key>
<integer>1</integer>
</map>
<key>LiruLegacySpeakerNames</key>
<map>
<key>Comment</key>
<string>Whether all lists of speakers use legacy names, or your desired way of displaying names.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>LiruMapShowAvCount</key>
<map>
<key>Comment</key>

2
indra/newview/ascentprefschat.cpp
View File

@@ -297,6 +297,7 @@ void LLPrefsAscentChat::refreshValues()
mOneLineConfButt = gSavedSettings.getBOOL("UseConciseConferenceButtons");
mOnlyComm = gSavedSettings.getBOOL("CommunicateSpecificShortcut");
mItalicizeActions = gSavedSettings.getBOOL("LiruItalicizeActions");
mLegacySpeakerNames = gSavedSettings.getBOOL("LiruILegacySpeakerNames");
//Autoresponse ------------------------------------------------------------------------
mIMResponseAnyoneItemID = gSavedPerAccountSettings.getString("AutoresponseAnyoneItemID");
@@ -534,6 +535,7 @@ void LLPrefsAscentChat::cancel()
gSavedSettings.setBOOL("UseConciseConferenceButtons", mOneLineConfButt);
gSavedSettings.setBOOL("CommunicateSpecificShortcut", mOnlyComm);
gSavedSettings.setBOOL("LiruItalicizeActions", mItalicizeActions);
gSavedSettings.setBOOL("LiruILegacySpeakerNames", mLegacySpeakerNames);
//Autoresponse ------------------------------------------------------------------------
gSavedPerAccountSettings.setString("AutoresponseAnyoneItemID", mIMResponseAnyoneItemID);

1
indra/newview/ascentprefschat.h
View File

@@ -86,6 +86,7 @@ protected:
bool mOneLineConfButt;
bool mOnlyComm;
bool mItalicizeActions;
bool mLegacySpeakerNames;
//Autoresponse ------------------------------------------------------------------------
std::string mIMResponseAnyoneItemID;

6
indra/newview/llspeakers.cpp
View File

@@ -88,7 +88,11 @@ void LLSpeaker::lookupName()
void LLSpeaker::onNameCache(const LLAvatarName& full_name)
{
LLAvatarNameCache::getPNSName(full_name, mDisplayName);
static const LLCachedControl<bool> legacy_name("LiruLegacySpeakerNames");
if (legacy_name)
mDisplayName = gCacheName->cleanFullName(full_name.getLegacyName());
else
LLAvatarNameCache::getPNSName(full_name, mDisplayName);
}
bool LLSpeaker::isInVoiceChannel()

1
indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml
View File

@@ -55,6 +55,7 @@
<check_box bottom_delta="-20" follows="top" control_name="PhoenixIMAnnounceStealFocus" label="Focus new instant messages" name="chat_steal_focus"/>
<check_box bottom_delta="-20" follows="left|top" control_name="ShowLocalChatFloaterBar" label="Show chat bar in torn-off local chat floater" name="show_local_chat_floater_bar"/>
<check_box bottom_delta="-20" control_name="ContactsUseHorizontalButtons" follows="top" height="16" label="Use horizontal buttons for contacts floater (Needs restart)" tool_tip="When enabled, the buttons on the Friends and Groups panels will be at the bottom, horizontally arranged, instead of vertically arranged on the right." name="horiz_butt"/>
<check_box bottom_delta="-20" follows="top" height="16" control_name="LiruLegacySpeakerNames" label="Use legacy names for speaker lists (Affects new speakers)" tool_tip="Allows for easier moderation of chats by showing only the account names" name="legacy_speaker_names"/>
<check_box bottom_delta="-20" control_name="UseConciseIMButtons" follows="top" height="16" label="Buttons on the same line as name for IMs (Affects new IMs)" name="im_concise_butt"/>
<check_box bottom_delta="-20" control_name="UseConciseGroupChatButtons" follows="top" height="16" label="Buttons on group chat name line (Affects new group chats)" name="group_concise_butt"/>
<check_box bottom_delta="-20" control_name="UseConciseConferenceButtons" follows="top" height="16" label="Buttons on conference title line (Affects new conferences)" name="conf_concise_butt"/>