Remove prototype support for badges next to avatar names

Easy to reimplement if we decide we want to do it.

3 files changed, 5 insertions, 29 deletions

diff --git a/indra/llcommon/llavatarname.cpp b/indra/llcommon/llavatarname.cpp
index 4272e096ed..4eeb6e706d 100644
--- a/indra/llcommon/llavatarname.cpp
+++ b/indra/llcommon/llavatarname.cpp
@@ -50,8 +50,7 @@ LLAvatarName::LLAvatarName()
 	mDisplayName(),
 	mIsDisplayNameDefault(false),
 	mIsDummy(false),
-	mExpires(F64_MAX),
-	mBadge()
+	mExpires(F64_MAX)
 { }
 
 bool LLAvatarName::operator<(const LLAvatarName& rhs) const
diff --git a/indra/llcommon/llavatarname.h b/indra/llcommon/llavatarname.h
index 3e26887d7a..d7d91e1c7a 100644
--- a/indra/llcommon/llavatarname.h
+++ b/indra/llcommon/llavatarname.h
@@ -70,10 +70,6 @@ public:
 	// last checked.
 	// Unix time-from-epoch seconds for efficiency
 	F64 mExpires;
-
-	// Can be a viewer UI image name ("Person_Check") or a server-side
-	// image UUID, or empty string.
-	std::string mBadge;
 };
 
 #endif
diff --git a/indra/llui/llurlentry.cpp b/indra/llui/llurlentry.cpp
index a79a257c09..d59bd0cb71 100644
--- a/indra/llui/llurlentry.cpp
+++ b/indra/llui/llurlentry.cpp
@@ -334,10 +334,8 @@ void LLUrlEntryAgent::onAvatarNameCache(const LLUUID& id,
 {
 	// IDEVO demo code
 	std::string label = av_name.mDisplayName + " (" + av_name.mSLID + ")";
-	// use custom icon if available
-	std::string icon = (!av_name.mBadge.empty() ? av_name.mBadge : mIcon);
 	// received the agent name from the server - tell our observers
-	callObservers(id.asString(), label, icon);
+	callObservers(id.asString(), label, mIcon);
 }
 
 std::string LLUrlEntryAgent::getTooltip(const std::string &string) const
@@ -456,26 +454,9 @@ std::string LLUrlEntryAgent::getLabel(const std::string &url, const LLUrlLabelCa
 
 std::string LLUrlEntryAgent::getIcon(const std::string &url) const
 {
-	std::string agent_id_string = getIDStringFromUrl(url);
-	if (agent_id_string.empty())
-	{
-		return mIcon;
-	}
-
-	LLUUID agent_id(agent_id_string);
-	if (agent_id.isNull())
-	{
-		return mIcon;
-	}
-
-	LLAvatarName av_name;
-	LLAvatarNameCache::get(agent_id, &av_name);
-	if (av_name.mBadge.empty())
-	{
-		return mIcon;
-	}
-
-	return av_name.mBadge;
+	// *NOTE: Could look up a badge here by calling getIDStringFromUrl()
+	// and looking up the badge for the agent.
+	return mIcon;
 }
 
 //