Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer.git

Shyotl · Shyotl · commit 4de8c3a38ec9 · 2020-03-27T02:56:20.000-05:00
diff --git a/indra/llui/llurlentry.cpp b/indra/llui/llurlentry.cpp
@@ -666,7 +666,7 @@ std::string LLUrlEntryAgent::getLabel(const std::string &url, const LLUrlLabelCa
 	LLAvatarName av_name;
 	if (LLAvatarNameCache::get(agent_id, &av_name))
 	{
-		std::string label = av_name.getCompleteName();
+		std::string label = av_name.getNSName();
 
 		// handle suffixes like /mute or /offerteleport
 		label = localize_slapp_label(url, label);

Original file line number	Diff line number	Diff line change
`@@ -666,7 +666,7 @@ std::string LLUrlEntryAgent::getLabel(const std::string &url, const LLUrlLabelCa`
`666`	`666`	`LLAvatarName av_name;`
`667`	`667`	`if (LLAvatarNameCache::get(agent_id, &av_name))`
`668`	`668`	`{`
`669`		`- std::string label = av_name.getCompleteName();`
	`669`	`+ std::string label = av_name.getNSName();`
`670`	`670`
`671`	`671`	`// handle suffixes like /mute or /offerteleport`
`672`	`672`	`label = localize_slapp_label(url, label);`