From ccc15df25f86d14bb28c550d64ca4ed77f3fde6e Mon Sep 17 00:00:00 2001 From: Richard Linden Date: Wed, 26 Feb 2014 11:58:37 -0800 Subject: MAINT-3448 FIX: Timestamps disappear from conversation log after viewer restart --- indra/newview/llconversationlog.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra') diff --git a/indra/newview/llconversationlog.cpp b/indra/newview/llconversationlog.cpp index 03b1f14a03..91f99d7b47 100755 --- a/indra/newview/llconversationlog.cpp +++ b/indra/newview/llconversationlog.cpp @@ -55,7 +55,7 @@ struct ConversationParams : public LLInitParam::Block LLConversation::LLConversation(const ConversationParams& params) : mTime(params.time), - mTimestamp(params.timestamp), + mTimestamp(params.timestamp.isProvided() ? params.timestamp : createTimestamp(params.time)), mConversationType(params.conversation_type), mConversationName(params.conversation_name), mHistoryFileName(params.history_filename), -- cgit v1.2.3