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

Touchups to namesystem update

Browse Source
This commit is contained in:
Inusaito Sayori
2014-03-25 19:39:02 -04:00
parent f37d83abe1
commit de2ce83a8d
7 changed files with 33 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llmessage/llavatarnamecache.cpp
View File

@@ -693,7 +693,7 @@ void LLAvatarNameCache::getPNSName(const LLAvatarName& avatar_name, std::string&
case 0 : name = avatar_name.getLegacyName(); break;
case 1 : name = avatar_name.getCompleteName(); break;
case 2 : name = avatar_name.mDisplayName; break;
case 3 : name = avatar_name.getLegacyName() + " (" + avatar_name.mDisplayName + ")"; break;
case 3 : name = avatar_name.getLegacyName() + (avatar_name.mIsDisplayNameDefault ? "" : " (" + avatar_name.mDisplayName + ")"); break;
default : name = avatar_name.getLegacyName(); break;
}
}

32
indra/newview/ascentprefschat.cpp
View File

@@ -298,11 +298,11 @@ void LLPrefsAscentChat::refreshValues()
mOnlyComm = gSavedSettings.getBOOL("CommunicateSpecificShortcut");
mItalicizeActions = gSavedSettings.getBOOL("LiruItalicizeActions");
mLegacyLogLaunch = gSavedSettings.getBOOL("LiruLegacyLogLaunch");
mFriendNames = gSavedSettings.getBOOL("FriendNameSystem");
mGroupMembersNames = gSavedSettings.getBOOL("GroupMembersNameSystem");
mLandManagementNames = gSavedSettings.getBOOL("LandManagementNameSystem");
mRadarNames = gSavedSettings.getBOOL("RadarNameSystem");
mSpeakerNames = gSavedSettings.getBOOL("SpeakerNameSystem");
mFriendNames = gSavedSettings.getS32("FriendNameSystem");
mGroupMembersNames = gSavedSettings.getS32("GroupMembersNameSystem");
mLandManagementNames = gSavedSettings.getS32("LandManagementNameSystem");
mRadarNames = gSavedSettings.getS32("RadarNameSystem");
mSpeakerNames = gSavedSettings.getS32("SpeakerNameSystem");
//Autoresponse ------------------------------------------------------------------------
mIMResponseAnyoneItemID = gSavedPerAccountSettings.getString("AutoresponseAnyoneItemID");
@@ -380,6 +380,18 @@ void LLPrefsAscentChat::refresh()
combo->setCurrentByIndex(mDateFormat);
}
//Chat UI -----------------------------------------------------------------------------
if (combo = getChild<LLComboBox>("friends_namesystem_combobox"))
combo->setCurrentByIndex(mFriendNames);
if (combo = getChild<LLComboBox>("group_members_namesystem_combobox"))
combo->setCurrentByIndex(mGroupMembersNames);
if (combo = getChild<LLComboBox>("land_management_namesystem_combobox"))
combo->setCurrentByIndex(mLandManagementNames);
if (combo = getChild<LLComboBox>("radar_namesystem_combobox"))
combo->setCurrentByIndex(mRadarNames);
if (combo = getChild<LLComboBox>("speaker_namesystem_combobox"))
combo->setCurrentByIndex(mSpeakerNames);
//Antispam ------------------------------------------------------------------------
// sensitivity tuners
childSetEnabled("spammsg_checkbox", mEnableAS);
@@ -541,11 +553,11 @@ void LLPrefsAscentChat::cancel()
gSavedSettings.setBOOL("CommunicateSpecificShortcut", mOnlyComm);
gSavedSettings.setBOOL("LiruItalicizeActions", mItalicizeActions);
gSavedSettings.setBOOL("LiruLegacyLogLaunch", mLegacyLogLaunch);
gSavedSettings.setBOOL("FriendNameSystem", mFriendNames);
gSavedSettings.setBOOL("GroupMembersNameSystem", mGroupMembersNames);
gSavedSettings.setBOOL("LandManagementNameSystem", mLandManagementNames);
gSavedSettings.setBOOL("RadarNameSystem", mRadarNames);
gSavedSettings.setBOOL("SpeakerNameSystem", mSpeakerNames);
gSavedSettings.setS32("FriendNameSystem", mFriendNames);
gSavedSettings.setS32("GroupMembersNameSystem", mGroupMembersNames);
gSavedSettings.setS32("LandManagementNameSystem", mLandManagementNames);
gSavedSettings.setS32("RadarNameSystem", mRadarNames);
gSavedSettings.setS32("SpeakerNameSystem", mSpeakerNames);
//Autoresponse ------------------------------------------------------------------------
gSavedPerAccountSettings.setString("AutoresponseAnyoneItemID", mIMResponseAnyoneItemID);

2
indra/newview/llstartup.cpp
View File

@@ -3455,7 +3455,7 @@ void LLStartUp::initNameCache()
// capabilities for display name lookup
LLAvatarNameCache::initClass(false);
S32 phoenix_name_system = gSavedSettings.getS32("PhoenixNameSystem");
if(phoenix_name_system <= 0 || phoenix_name_system > 2) LLAvatarNameCache::setUseDisplayNames(false);
if(phoenix_name_system <= 0 || phoenix_name_system > 3) LLAvatarNameCache::setUseDisplayNames(false);
else LLAvatarNameCache::setUseDisplayNames(true);
}

2
indra/newview/llviewercontrol.cpp
View File

@@ -614,7 +614,7 @@ bool handleAscentAvatarModifier(const LLSD& newvalue)
static bool handlePhoenixNameSystemChanged(const LLSD& newvalue)
{
S32 dnval = (S32)newvalue.asInteger();
if (dnval <= 0 || dnval > 2) LLAvatarNameCache::setUseDisplayNames(false);
if (dnval <= 0 || dnval > 3) LLAvatarNameCache::setUseDisplayNames(false);
else LLAvatarNameCache::setUseDisplayNames(true);
LLVOAvatar::invalidateNameTags();
return true;

5
indra/newview/llviewerstats.cpp
View File

@@ -878,8 +878,9 @@ void send_stats()
llinfos << "Misc Stats: int_1: " << misc["int_1"] << " int_2: " << misc["int_2"] << llendl;
llinfos << "Misc Stats: string_1: " << misc["string_1"] << " string_2: " << misc["string_2"] << llendl;
body["DisplayNamesEnabled"] = gSavedSettings.getS32("PhoenixNameSystem") == 1 || gSavedSettings.getS32("PhoenixNameSystem") == 2;
body["DisplayNamesShowUsername"] = gSavedSettings.getS32("PhoenixNameSystem") == 1;
const S32 namesys = gSavedSettings.getS32("PhoenixNameSystem");
body["DisplayNamesEnabled"] = namesys > 0 && namesys < 4;
body["DisplayNamesShowUsername"] = namesys == 1 || namesys == 3;
body["MinimalSkin"] = false;

6
indra/newview/llvoavatar.cpp
View File

@@ -3312,7 +3312,7 @@ void LLVOAvatar::idleUpdateNameTagText(BOOL new_name)
static const LLCachedControl<S32> phoenix_name_system("PhoenixNameSystem", 0);
bool show_display_names = phoenix_name_system == 1 || phoenix_name_system == 2;
bool show_display_names = phoenix_name_system > 0 || phoenix_name_system < 4;
bool show_usernames = phoenix_name_system != 2;
if (show_display_names && LLAvatarNameCache::useDisplayNames())
{
@@ -3332,7 +3332,7 @@ void LLVOAvatar::idleUpdateNameTagText(BOOL new_name)
// Might be blank if name not available yet, that's OK
if (show_display_names)
{
firstnameText=av_name.mDisplayName; //Defer for later formatting
firstnameText = phoenix_name_system == 3 ? av_name.mUsername : av_name.mDisplayName; //Defer for later formatting
//addNameTagLine(av_name.mDisplayName, name_tag_color, LLFontGL::NORMAL,
// LLFontGL::getFontSansSerif());
}
@@ -3341,7 +3341,7 @@ void LLVOAvatar::idleUpdateNameTagText(BOOL new_name)
{
firstnameText.push_back(' ');
firstnameText.push_back('(');
firstnameText.append(av_name.mUsername); //Defer for later formatting
firstnameText.append(phoenix_name_system == 3 ? av_name.mDisplayName : av_name.mUsername); //Defer for later formatting
firstnameText.push_back(')');
// *HACK: Desaturate the color
//LLColor4 username_color = name_tag_color * 0.83f;

3
indra/newview/rlvui.cpp
View File

@@ -306,7 +306,8 @@ void RlvUIEnabler::onToggleShowNames(bool fQuitting)
else
{
LLAvatarNameCache::setForceDisplayNames(false);
LLAvatarNameCache::setUseDisplayNames(gSavedSettings.getS32("PhoenixNameSystem") == 1 || gSavedSettings.getS32("PhoenixNameSystem") == 2);
const S32 namesys = gSavedSettings.getS32("PhoenixNameSystem");
LLAvatarNameCache::setUseDisplayNames(namesys > 0 && namesys < 4);
}
LLVOAvatar::invalidateNameTags(); // See handleDisplayNamesOptionChanged()
}