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

The Name System update!

Browse Source 
Adds name list specific name settings, Removes boolean for having lists of speakers with legacy names in favor of having a more flexible setting for them
Have a look at the combo boxes on Adv. Chat->Chat UI to customize these new settings.

There is now a fourth option for name display: LegaCy Name (D is play Name)
This commit is contained in:
Inusaito Sayori
2014-03-24 17:52:13 -04:00
parent 5affacab70
commit ee610ceb3f
17 changed files with 160 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
indra/newview/llfloaterfriends.cpp
View File

@@ -407,6 +407,12 @@ BOOL LLPanelFriends::postBuild()
return TRUE;
}
static const S32& friend_name_system()
{
static const LLCachedControl<S32> name_system("FriendNameSystem", 0);
return name_system;
}
BOOL LLPanelFriends::addFriend(const LLUUID& agent_id)
{
LLAvatarTracker& at = LLAvatarTracker::instance();
@@ -417,7 +423,7 @@ BOOL LLPanelFriends::addFriend(const LLUUID& agent_id)
bool isOnline = relationInfo->isOnline();
std::string fullname;
BOOL have_name = LLAvatarNameCache::getPNSName(agent_id, fullname);
bool have_name = LLAvatarNameCache::getPNSName(agent_id, fullname, friend_name_system());
if (!have_name) gCacheName->getFullName(agent_id, fullname);
LLSD element;
@@ -505,7 +511,7 @@ BOOL LLPanelFriends::updateFriendItem(const LLUUID& agent_id, const LLRelationsh
bool isOnline = info->isOnline();
std::string fullname;
BOOL have_name = LLAvatarNameCache::getPNSName(agent_id, fullname);
bool have_name = LLAvatarNameCache::getPNSName(agent_id, fullname, friend_name_system());
if (!have_name) gCacheName->getFullName(agent_id, fullname);
// Name of the status icon to use
@@ -1083,7 +1089,7 @@ void LLPanelFriends::confirmModifyRights(rights_map_t& rights, EGrantRevoke comm
{
LLSD args;
std::string fullname;
if (LLAvatarNameCache::getPNSName(rights.begin()->first, fullname))
if (LLAvatarNameCache::getPNSName(rights.begin()->first, fullname, friend_name_system()))
args["NAME"] = fullname;
if (command == GRANT)