From 46b6df1b484ed7a6dd96eb62f9e7e24d4426a45a Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Mon, 27 Aug 2018 18:21:46 +0300
Subject: [PATCH] line endings fix
---
indra/newview/llrecentpeople.cpp | 40 ++++++++++++++++----------------
1 file changed, 20 insertions(+), 20 deletions(-)
diff --git a/indra/newview/llrecentpeople.cpp b/indra/newview/llrecentpeople.cpp
index 8bea9aad477..83b0c4f1bf2 100644
--- a/indra/newview/llrecentpeople.cpp
+++ b/indra/newview/llrecentpeople.cpp
@@ -126,25 +126,25 @@ bool LLRecentPeople::handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
add(event->getValue().asUUID());
return true;
}
-
-void LLRecentPeople::updateAvatarsArrivalTime(uuid_vec_t& uuids)
-{
- id_to_time_map_t buf = mAvatarsArrivalTime;
- mAvatarsArrivalTime.clear();
-
- for (uuid_vec_t::const_iterator id_it = uuids.begin(); id_it != uuids.end(); ++id_it)
- {
- if (buf.find(*id_it) != buf.end())
- {
- mAvatarsArrivalTime[*id_it] = buf[*id_it];
- }
- else
- {
- mAvatarsArrivalTime[*id_it] = LLDate::now().secondsSinceEpoch();
- }
- }
-}
-
+
+void LLRecentPeople::updateAvatarsArrivalTime(uuid_vec_t& uuids)
+{
+ id_to_time_map_t buf = mAvatarsArrivalTime;
+ mAvatarsArrivalTime.clear();
+
+ for (uuid_vec_t::const_iterator id_it = uuids.begin(); id_it != uuids.end(); ++id_it)
+ {
+ if (buf.find(*id_it) != buf.end())
+ {
+ mAvatarsArrivalTime[*id_it] = buf[*id_it];
+ }
+ else
+ {
+ mAvatarsArrivalTime[*id_it] = LLDate::now().secondsSinceEpoch();
+ }
+ }
+}
+
F32 LLRecentPeople::getArrivalTimeByID(const LLUUID& id)
{
id_to_time_map_t::const_iterator it = mAvatarsArrivalTime.find(id);
@@ -154,5 +154,5 @@ F32 LLRecentPeople::getArrivalTimeByID(const LLUUID& id)
return it->second;
}
return LLDate::now().secondsSinceEpoch();
-}
+}
--
GitLab