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

Add option to show Client tags on a new line

Browse Source 
The checkbox is available in Preferences > Vanity > Tags/Colors.
Debug Setting: SLBDisplayClientTagOnNewLine
This commit is contained in:
Salvatore La Bua
2013-09-28 05:32:54 +02:00
parent afe0f7ef3d
commit df7c60de35
8 changed files with 30 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
indra/newview/llvoavatar.cpp
View File

@@ -564,6 +564,7 @@ SHClientTagMgr::SHClientTagMgr()
gSavedSettings.getControl("AscentEstateOwnerColor")->getSignal()->connect(boost::bind(&LLVOAvatar::invalidateNameTags));
gSavedSettings.getControl("AscentFriendColor")->getSignal()->connect(boost::bind(&LLVOAvatar::invalidateNameTags));
gSavedSettings.getControl("AscentMutedColor")->getSignal()->connect(boost::bind(&LLVOAvatar::invalidateNameTags));
gSavedSettings.getControl("SLBDisplayClientTagOnNewLine")->getSignal()->connect(boost::bind(&LLVOAvatar::invalidateNameTags));
//Following group of settings all actually manipulate the tag cache for agent avatar. Even if the tag system is 'disabled', we still allow an
//entry to exist for the agent avatar.
@@ -3060,6 +3061,7 @@ void LLVOAvatar::idleUpdateNameTagText(BOOL new_name)
LLNameValue *title = getNVPair("Title");
LLNameValue* firstname = getNVPair("FirstName");
LLNameValue* lastname = getNVPair("LastName");
static const LLCachedControl<bool> display_client_new_line("SLBDisplayClientTagOnNewLine");
// Avatars must have a first and last name
if (!firstname || !lastname) return;
@@ -3282,7 +3284,12 @@ void LLVOAvatar::idleUpdateNameTagText(BOOL new_name)
else if(allow_nameplate_override && !mCCSAttachmentText.empty())
tag_format=mCCSAttachmentText;
else
tag_format=sRenderGroupTitles ? "%g\n%f %l %t" : "%f %l %t";
{
if(!display_client_new_line)
tag_format=sRenderGroupTitles ? "%g\n%f %l %t" : "%f %l %t";
else
tag_format=sRenderGroupTitles ? "%g\n%f %l\n%t" : "%f %l\n%t";
}
// replace first name, last name and title
typedef boost::tokenizer<boost::char_separator<char> > tokenizer;