From c207f3b90c1e083bd0f52b6759c2163daeb8a7d2 Mon Sep 17 00:00:00 2001
From: Nicky <none@none>
Date: Tue, 10 Jun 2014 20:00:34 +0200
Subject: [PATCH] Fix merge error in llconversationlog.cpp.

---
 indra/newview/llconversationlog.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indra/newview/llconversationlog.cpp b/indra/newview/llconversationlog.cpp
index 86f5982302..97cfdd4473 100755
--- a/indra/newview/llconversationlog.cpp
+++ b/indra/newview/llconversationlog.cpp
@@ -560,7 +560,7 @@ bool LLConversationLog::loadFromFile(const std::string& filename)
 		// being over 30 days old should be purged from the conversation log text file on login.
 		// <FS:CR> Shut up, CHUI-325 Let the user decide.
 		U32 CONVERSATION_LIFETIME = gSavedSettings.getU32("FSConversationLogLifetime");
-		if (conversation.isOlderThan(CONVERSATION_LIFETIME))
+		if (conversation.isOlderThan( U32Days(CONVERSATION_LIFETIME) ) )
 		{
 			continue;
 		}