summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xindra/newview/llconversationlog.cpp2
1 files changed, 1 insertions, 1 deletions
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<ConversationParams>
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),