Per-avatar customizable icons next to name links in text

Changed LLUrlEntryAgent callbacks to handle both link label and icon
Eliminated legacy LLNameCache file loading
Reviewed with Kelly

2 files changed, 18 insertions, 0 deletions

diff --git a/indra/llcommon/llavatarname.cpp b/indra/llcommon/llavatarname.cpp
index 0563374785..3b1ab4d267 100644
--- a/indra/llcommon/llavatarname.cpp
+++ b/indra/llcommon/llavatarname.cpp
@@ -35,6 +35,13 @@
 
 #include "llavatarname.h"
 
+LLAvatarName::LLAvatarName()
+:	mSLID(),
+	mDisplayName(),
+	mLastUpdate(0),
+	mBadge()
+{ }
+
 bool LLAvatarName::operator<(const LLAvatarName& rhs) const
 {
 	if (mSLID == rhs.mSLID)
diff --git a/indra/llcommon/llavatarname.h b/indra/llcommon/llavatarname.h
index 4264a8e655..7205eb4523 100644
--- a/indra/llcommon/llavatarname.h
+++ b/indra/llcommon/llavatarname.h
@@ -39,6 +39,8 @@
 class LL_COMMON_API LLAvatarName
 {
 public:
+	LLAvatarName();
+
 	bool operator<(const LLAvatarName& rhs) const;
 
 	// "bobsmith123" or "james.linden", US-ASCII only
@@ -48,6 +50,15 @@ public:
 	// Contains data whether or not user has explicitly set
 	// a display name; may duplicate their SLID.
 	std::string mDisplayName;
+
+	// Names can change, so need to keep track of when name was
+	// last checked.
+	// Unix time-from-epoch seconds
+	U32 mLastUpdate;
+
+	// Can be a viewer UI image name ("Person_Check") or a server-side
+	// image UUID, or empty string.
+	std::string mBadge;
 };
 
 #endif