Preference to set what fields name tags display, and

first attempt at "use display names" menu item which
doesn't work yet

2 files changed, 17 insertions, 2 deletions

diff --git a/indra/llmessage/llavatarnamecache.cpp b/indra/llmessage/llavatarnamecache.cpp
index 0d6981a9d9..0941dff0fa 100644
--- a/indra/llmessage/llavatarnamecache.cpp
+++ b/indra/llmessage/llavatarnamecache.cpp
@@ -44,8 +44,7 @@
 
 namespace LLAvatarNameCache
 {
-	// base URL for name lookup service
-	std::string sNameServiceURL;
+	bool sUseDisplayNames = false;
 
 	// accumulated agent IDs for next query against service
 	typedef std::set<LLUUID> ask_queue_t;
@@ -300,3 +299,15 @@ bool LLAvatarNameCache::get(const LLUUID& agent_id, LLAvatarName *av_name)
 void LLAvatarNameCache::get(const LLUUID& agent_id, name_cache_callback_t callback)
 {
 }
+
+void LLAvatarNameCache::toggleDisplayNames()
+{
+	sUseDisplayNames = !sUseDisplayNames;
+	// flush our cache
+	sCache.clear();
+}
+
+bool LLAvatarNameCache::useDisplayNames()
+{
+	return sUseDisplayNames;
+}
diff --git a/indra/llmessage/llavatarnamecache.h b/indra/llmessage/llavatarnamecache.h
index a0e6abf303..9f0472095d 100644
--- a/indra/llmessage/llavatarnamecache.h
+++ b/indra/llmessage/llavatarnamecache.h
@@ -55,6 +55,10 @@ namespace LLAvatarNameCache
 	// If name information is in cache, callback will be called immediately.
 	typedef void (*name_cache_callback_t)(const LLUUID& agent_id, const LLAvatarName& av_name);
 	void get(const LLUUID& agent_id, name_cache_callback_t callback);
+	
+	// HACK: turn display names on and off
+	void toggleDisplayNames();
+	bool useDisplayNames();
 }
 
 #endif