3 files changed, 26 insertions, 4 deletions
diff --git a/indra/llmessage/llavatarnamecache.cpp b/indra/llmessage/llavatarnamecache.cpp
index 9a68093427..31dd264021 100755
--- a/indra/llmessage/llavatarnamecache.cpp
+++ b/indra/llmessage/llavatarnamecache.cpp
@@ -680,6 +680,15 @@ void LLAvatarNameCache::setUseDisplayNames(bool use)
 	}
 }
 
+void LLAvatarNameCache::setUseUsernames(bool use)
+{
+	if (use != LLAvatarName::useUsernames())
+	{
+		LLAvatarName::setUseUsernames(use);
+		mUseDisplayNamesSignal();
+	}
+}
+
 void LLAvatarNameCache::erase(const LLUUID& agent_id)
 {
 	sCache.erase(agent_id);
diff --git a/indra/llmessage/llavatarnamecache.h b/indra/llmessage/llavatarnamecache.h
index 2a8eb46187..3a19cee3ed 100755
--- a/indra/llmessage/llavatarnamecache.h
+++ b/indra/llmessage/llavatarnamecache.h
@@ -80,6 +80,8 @@ namespace LLAvatarNameCache
 	// Set display name: flips the switch and triggers the callbacks.
 	void setUseDisplayNames(bool use);
 	
+	void setUseUsernames(bool use);
+
 	void insert(const LLUUID& agent_id, const LLAvatarName& av_name);
 	void erase(const LLUUID& agent_id);
 
diff --git a/indra/llmessage/message.cpp b/indra/llmessage/message.cpp
index ae95087377..c3642ccbe8 100755
--- a/indra/llmessage/message.cpp
+++ b/indra/llmessage/message.cpp
@@ -3032,12 +3032,23 @@ void LLMessageSystem::setExceptionFunc(EMessageException e,
 BOOL LLMessageSystem::callExceptionFunc(EMessageException exception)
 {
 	callbacks_t::iterator it = mExceptionCallbacks.find(exception);
-	if(it != mExceptionCallbacks.end())
+	if(it == mExceptionCallbacks.end())
 	{
-		((*it).second.first)(this, (*it).second.second,exception);
-		return TRUE;
+		return FALSE;
 	}
-	return FALSE;
+
+	exception_t& ex = it->second;
+	msg_exception_callback ex_cb = ex.first;
+
+	if (!ex_cb)
+	{
+		LL_WARNS("Messaging") << "LLMessageSystem::callExceptionFunc: bad message exception callback." << llendl;
+		return FALSE;
+	}
+
+	(ex_cb)(this, ex.second, exception);
+
+	return TRUE;
 }
 
 void LLMessageSystem::setTimingFunc(msg_timing_callback func, void* data)