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

19
indra/newview/llnamelistctrl.cpp
View File

@@ -49,11 +49,11 @@ void LLNameListCtrl::NameTypeNames::declareValues()
declare("SPECIAL", LLNameListCtrl::SPECIAL);
}
LLNameListCtrl::LLNameListCtrl(const std::string& name, const LLRect& rect, BOOL allow_multiple_selection, BOOL draw_border, bool draw_heading, S32 name_column_index, const std::string& tooltip)
LLNameListCtrl::LLNameListCtrl(const std::string& name, const LLRect& rect, BOOL allow_multiple_selection, BOOL draw_border, bool draw_heading, S32 name_column_index, const std::string& name_system, const std::string& tooltip)
: LLScrollListCtrl(name, rect, NULL, allow_multiple_selection, draw_border,draw_heading),
mNameColumnIndex(name_column_index),
mAllowCallingCardDrop(false),
mShortNames(false),
mNameSystem(name_system),
mAvatarNameCacheConnection()
{
setToolTip(tooltip);
@@ -189,10 +189,7 @@ LLScrollListItem* LLNameListCtrl::addNameItemRow(
}
else if (LLAvatarNameCache::get(id, &av_name))
{
if (mShortNames)
fullname = av_name.mDisplayName;
else
fullname = av_name.getCompleteName();
LLAvatarNameCache::getPNSName(av_name, fullname, mNameSystem);
}
else
{
@@ -266,10 +263,7 @@ void LLNameListCtrl::onAvatarNameCache(const LLUUID& agent_id,
//mAvatarNameCacheConnection.disconnect();
std::string name;
if (mShortNames)
name = av_name.mDisplayName;
else
name = av_name.getCompleteName();
LLAvatarNameCache::getPNSName(av_name, name, mNameSystem);
LLNameListItem* list_item = item.get();
if (list_item && list_item->getUUID() == agent_id)
@@ -326,7 +320,10 @@ LLView* LLNameListCtrl::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFacto
S32 name_column_index = 0;
node->getAttributeS32("name_column_index", name_column_index);
LLNameListCtrl* name_list = new LLNameListCtrl("name_list", rect, multi_select, draw_border, draw_heading, name_column_index);
std::string name_system("PhoenixNameSystem");
node->getAttributeString("name_system", name_system);
LLNameListCtrl* name_list = new LLNameListCtrl("name_list", rect, multi_select, draw_border, draw_heading, name_column_index, name_system);
if (node->hasAttribute("heading_height"))
{
S32 heading_height;