diff options
| author | Richard Linden <none@none> | 2013-08-14 11:51:49 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-08-14 11:51:49 -0700 |
| commit | 26581404e426b00cd0a07c38b5cb858d5d5faa28 (patch) | |
| tree | f2a9a512fac56b7ce4f5f643617346e05c0a2992 /indra/newview/llconversationlog.cpp | |
| parent | 9faaa28f4445425e8c5b7b002faffbe0365b905d (diff) | |
BUILDFIX: added header for numeric_limits support on gcc
added convenience types for units F32Seconds, etc.
Diffstat (limited to 'indra/newview/llconversationlog.cpp')
| -rwxr-xr-x | indra/newview/llconversationlog.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llconversationlog.cpp b/indra/newview/llconversationlog.cpp index 8dd148e304..a17a4e5e21 100755 --- a/indra/newview/llconversationlog.cpp +++ b/indra/newview/llconversationlog.cpp @@ -132,7 +132,7 @@ const std::string LLConversation::createTimestamp(const LLUnit<U64, LLUnits::Sec bool LLConversation::isOlderThan(U32 days) const { - LLUnit<U64, LLUnits::Seconds> now = time_corrected(); + LLUnit<U64, LLUnits::Seconds> now(time_corrected()); LLUnit<U32, LLUnits::Days> age = now - mTime; return age > days; @@ -535,7 +535,7 @@ bool LLConversationLog::loadFromFile(const std::string& filename) history_file_name); ConversationParams params; - params.time(time) + params.time(LLUnits::Seconds::fromValue(time)) .conversation_type((SessionType)stype) .has_offline_ims(has_offline_ims) .conversation_name(conv_name_buffer) |