From 2ce3f2c1318fdd2873845885e7059083ddfc9641 Mon Sep 17 00:00:00 2001 From: Inusaito Sayori Date: Fri, 23 May 2014 03:39:35 -0400 Subject: [PATCH] Meeting Request: Display date not just time in Teleport History Will not change old entries because of the stupid way teleport history is saved. Seriously, this floater needs a rewrite... we should just use v3. --- indra/newview/llfloaterteleporthistory.cpp | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/indra/newview/llfloaterteleporthistory.cpp b/indra/newview/llfloaterteleporthistory.cpp index b3a6bad0c..2293b7875 100644 --- a/indra/newview/llfloaterteleporthistory.cpp +++ b/indra/newview/llfloaterteleporthistory.cpp @@ -107,22 +107,10 @@ void LLFloaterTeleportHistory::addPendingEntry(std::string regionName, S16 x, S1 // Set pending entry timestamp - U32 utc_time; - utc_time = time_corrected(); - struct tm* internal_time; - internal_time = utc_to_pacific_time(utc_time, gPacificDaylightTime); + struct tm* internal_time = utc_to_pacific_time(time_corrected(), gPacificDaylightTime); + timeStructToFormattedString(internal_time, gSavedSettings.getString("ShortDateFormat") + gSavedSettings.getString("LongTimeFormat"), mPendingTimeString); // check if we are in daylight savings time - std::string timeZone = " PST"; - if (gPacificDaylightTime) - { - timeZone = " PDT"; - } -#ifdef LOCALIZED_TIME - timeStructToFormattedString(internal_time, gSavedSettings.getString("LongTimeFormat"), mPendingTimeString); - mPendingTimeString += timeZone; -#else - mPendingTimeString = llformat("%02d:%02d:%02d", internal_time->tm_hour, internal_time->tm_min, internal_time->tm_sec) + timeZone; -#endif + mPendingTimeString += gPacificDaylightTime ? " PDT" : " PST"; // Set pending region name mPendingRegionName = regionName;