Merge latest from lindenlab/viewer-development

1 files changed, 13 insertions, 5 deletions

diff --git a/indra/newview/llnotificationhandlerutil.cpp b/indra/newview/llnotificationhandlerutil.cpp
index 70d588db52..de90023f3b 100644
--- a/indra/newview/llnotificationhandlerutil.cpp
+++ b/indra/newview/llnotificationhandlerutil.cpp
@@ -27,13 +27,17 @@
 
 #include "llviewerprecompiledheaders.h" // must be first include
 
-#include "llnotificationhandler.h"
+#include "llavatarnamecache.h"
+
+#include "llfloaterreg.h"
 #include "llnotifications.h"
-#include "llimview.h"
+#include "llurlaction.h"
+
 #include "llagent.h"
-#include "llfloaterreg.h"
-#include "llnearbychat.h"
 #include "llimfloater.h"
+#include "llimview.h"
+#include "llnearbychat.h"
+#include "llnotificationhandler.h"
 
 using namespace LLNotificationsUI;
 
@@ -275,7 +279,11 @@ void LLHandlerUtil::logToIM(const EInstantMessage& session_type,
 		{
 			from = SYSTEM_FROM;
 		}
-		LLIMModel::instance().logToFile(session_name, from, from_id, message);
+
+		// Build a new format username or firstname_lastname for legacy names
+		// to use it for a history log filename.
+		std::string user_name = LLCacheName::buildUsername(session_name);
+		LLIMModel::instance().logToFile(user_name, from, from_id, message);
 	}
 	else
 	{