From 9094968df5d253c3e849d1aaa0ca71b642e5adde Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Fri, 28 Jun 2013 23:47:30 +0200
Subject: [PATCH] Compile fixes for fsfloaternearbychat.cpp

---
 indra/newview/fsfloaternearbychat.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/indra/newview/fsfloaternearbychat.cpp b/indra/newview/fsfloaternearbychat.cpp
index 337406c328..3c5cec643f 100644
--- a/indra/newview/fsfloaternearbychat.cpp
+++ b/indra/newview/fsfloaternearbychat.cpp
@@ -271,7 +271,7 @@ void	FSFloaterNearbyChat::addMessage(const LLChat& chat,bool archive,const LLSD
 			LLAvatarName av_name;
 			LLAvatarNameCache::get(chat.mFromID, &av_name);
 
-			if (!av_name.mIsDisplayNameDefault)
+			if (!av_name.isDisplayNameDefault())
 			{
 				from_name = av_name.getCompleteName();
 			}
@@ -518,7 +518,7 @@ void FSFloaterNearbyChat::loadHistory()
 	do_not_log["do_not_log"] = true;
 
 	std::list<LLSD> history;
-	LLLogChat::loadAllHistory("chat", history);
+	LLLogChat::loadChatHistory("chat", history);
 
 	std::list<LLSD>::const_iterator it = history.begin();
 	// FS:LO FIRE-5230 - Chat Console Improvement: Replacing the "IM" in front of group chat messages with the actual group name