Viewer asks login.cgi if the grid supports display names

If not, turns off display names.  Cleaned up name cache reset code.
Alphabetized login auth param requests for easier merges going forward.

2 files changed, 7 insertions, 10 deletions

diff --git a/indra/llmessage/llavatarnamecache.cpp b/indra/llmessage/llavatarnamecache.cpp
index 62c2df90a9..69770c1f2a 100644
--- a/indra/llmessage/llavatarnamecache.cpp
+++ b/indra/llmessage/llavatarnamecache.cpp
@@ -34,7 +34,6 @@
 
 #include "llavatarnamecache.h"
 
-#include "llcachename.h"	// *TODO: remove
 #include "llframetimer.h"
 #include "llhttpclient.h"
 #include "llsd.h"
@@ -379,15 +378,13 @@ void LLAvatarNameCache::get(const LLUUID& agent_id, callback_slot_t slot)
 }
 
 
-void LLAvatarNameCache::toggleDisplayNames()
+void LLAvatarNameCache::setUseDisplayNames(bool use)
 {
-	sUseDisplayNames = !sUseDisplayNames;
-	// flush our cache
-	sCache.clear();
-	// force re-lookups
-	if (gCacheName)
+	if (use != sUseDisplayNames)
 	{
-		gCacheName->clear();
+		sUseDisplayNames = use;
+		// flush our cache
+		sCache.clear();
 	}
 }
 
diff --git a/indra/llmessage/llavatarnamecache.h b/indra/llmessage/llavatarnamecache.h
index 111e56433b..ad5ecc896e 100644
--- a/indra/llmessage/llavatarnamecache.h
+++ b/indra/llmessage/llavatarnamecache.h
@@ -69,8 +69,8 @@ namespace LLAvatarNameCache
 	// If name information is in cache, callback will be called immediately.
 	void get(const LLUUID& agent_id, callback_slot_t slot);
 
-	// HACK: turn display names on and off
-	void toggleDisplayNames();
+	// Not all grids support display names
+	void setUseDisplayNames(bool use);
 	bool useDisplayNames();
 
 	void erase(const LLUUID& agent_id);