diff options
| author | Richard Linden <none@none> | 2014-02-26 11:58:37 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2014-02-26 11:58:37 -0800 |
| commit | ccc15df25f86d14bb28c550d64ca4ed77f3fde6e (patch) | |
| tree | 9bcbc502e5502586bef026fa701fe4af9aefa02f /indra/newview | |
| parent | 80b4a4a1f54dccb814b5486423bf6492b3ae58a7 (diff) | |
MAINT-3448 FIX: Timestamps disappear from conversation log after viewer restart
Diffstat (limited to 'indra/newview')
| -rwxr-xr-x | indra/newview/llconversationlog.cpp | 2 |
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), |