Skip to content
Snippets Groups Projects
Commit 46b6df1b authored by maxim_productengine's avatar maxim_productengine
Browse files

line endings fix

parent a1e6383b
No related branches found
No related tags found
No related merge requests found
...@@ -126,25 +126,25 @@ bool LLRecentPeople::handleEvent(LLPointer<LLEvent> event, const LLSD& userdata) ...@@ -126,25 +126,25 @@ bool LLRecentPeople::handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
add(event->getValue().asUUID()); add(event->getValue().asUUID());
return true; return true;
} }
void LLRecentPeople::updateAvatarsArrivalTime(uuid_vec_t& uuids) void LLRecentPeople::updateAvatarsArrivalTime(uuid_vec_t& uuids)
{ {
id_to_time_map_t buf = mAvatarsArrivalTime; id_to_time_map_t buf = mAvatarsArrivalTime;
mAvatarsArrivalTime.clear(); mAvatarsArrivalTime.clear();
for (uuid_vec_t::const_iterator id_it = uuids.begin(); id_it != uuids.end(); ++id_it) for (uuid_vec_t::const_iterator id_it = uuids.begin(); id_it != uuids.end(); ++id_it)
{ {
if (buf.find(*id_it) != buf.end()) if (buf.find(*id_it) != buf.end())
{ {
mAvatarsArrivalTime[*id_it] = buf[*id_it]; mAvatarsArrivalTime[*id_it] = buf[*id_it];
} }
else else
{ {
mAvatarsArrivalTime[*id_it] = LLDate::now().secondsSinceEpoch(); mAvatarsArrivalTime[*id_it] = LLDate::now().secondsSinceEpoch();
} }
} }
} }
F32 LLRecentPeople::getArrivalTimeByID(const LLUUID& id) F32 LLRecentPeople::getArrivalTimeByID(const LLUUID& id)
{ {
id_to_time_map_t::const_iterator it = mAvatarsArrivalTime.find(id); id_to_time_map_t::const_iterator it = mAvatarsArrivalTime.find(id);
...@@ -154,5 +154,5 @@ F32 LLRecentPeople::getArrivalTimeByID(const LLUUID& id) ...@@ -154,5 +154,5 @@ F32 LLRecentPeople::getArrivalTimeByID(const LLUUID& id)
return it->second; return it->second;
} }
return LLDate::now().secondsSinceEpoch(); return LLDate::now().secondsSinceEpoch();
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment