diff options
| author | Richard Linden <none@none> | 2013-08-15 00:02:23 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-08-15 00:02:23 -0700 |
| commit | 9f7bfa1c3710856cd2b0a0a8a429d6c45b0fcd09 (patch) | |
| tree | abc27a8ff7406b2216a13ba3804b006e60f1f080 /indra/newview/llconversationlog.cpp | |
| parent | 01c1d40b3faa139e9aeacbea7acae3ab65ca9dcd (diff) | |
moved unit types out of LLUnits namespace, since they are prefixed
Diffstat (limited to 'indra/newview/llconversationlog.cpp')
| -rwxr-xr-x | indra/newview/llconversationlog.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llconversationlog.cpp b/indra/newview/llconversationlog.cpp index a17a4e5e21..9311056a27 100755 --- a/indra/newview/llconversationlog.cpp +++ b/indra/newview/llconversationlog.cpp @@ -39,7 +39,7 @@ const int CONVERSATION_LIFETIME = 30; // lifetime of LLConversation is 30 days b struct ConversationParams : public LLInitParam::Block<ConversationParams> { - Mandatory<LLUnit<U64, LLUnits::Seconds> > time; + Mandatory<U64Seconds > time; Mandatory<std::string> timestamp; Mandatory<SessionType> conversation_type; Mandatory<std::string> conversation_name, @@ -113,7 +113,7 @@ void LLConversation::onIMFloaterShown(const LLUUID& session_id) } // static -const std::string LLConversation::createTimestamp(const LLUnit<U64, LLUnits::Seconds>& utc_time) +const std::string LLConversation::createTimestamp(const U64Seconds& utc_time) { std::string timeStr; LLSD substitution; @@ -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()); + U64Seconds now(time_corrected()); LLUnit<U32, LLUnits::Days> age = now - mTime; return age > days; |