livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix merge error in llconversationlog.cpp.

Nicky 2014-06-10 20:00:34 +02:00
parent c7896e51ee
commit c207f3b90c
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llconversationlog.cpp
View File

@ -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;
}