From eac1e33ed70641b24f5763f71be46cd491a93253 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Tue, 3 Mar 2015 20:45:41 +0100
Subject: [PATCH] A few more changes to the money tracker:

* Fix first entry being shown properly if FSAlwaysTrackPayments is TRUE and floater is closed
* Show proper sort order indicator
* Always show seconds for timestamp
---
 indra/newview/fsmoneytracker.cpp                          | 8 ++------
 .../skins/default/xui/de/floater_fs_money_tracker.xml     | 2 +-
 .../skins/default/xui/en/floater_fs_money_tracker.xml     | 2 +-
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/indra/newview/fsmoneytracker.cpp b/indra/newview/fsmoneytracker.cpp
index 8cccd79d3e..846141a0a4 100644
--- a/indra/newview/fsmoneytracker.cpp
+++ b/indra/newview/fsmoneytracker.cpp
@@ -45,6 +45,7 @@ BOOL FSMoneyTracker::postBuild()
 {
 	mTransactionHistory = getChild<LLNameListCtrl>("payment_list");
 	mTransactionHistory->setContextMenu(&gFSMoneyTrackerListMenu);
+	mTransactionHistory->sortByColumn("time", TRUE);
 	clear();
 	
 	// Button Actions
@@ -87,12 +88,7 @@ void FSMoneyTracker::addPayment(const LLUUID other_id, bool is_group, S32 amount
 std::string FSMoneyTracker::getTime()
 {
 	time_t utc_time = time_corrected();
-	std::string timeStr = "[" + LLTrans::getString("TimeHour") + "]:[" + LLTrans::getString("TimeMin") + "]";
-	
-	if (gSavedSettings.getBOOL("FSSecondsinChatTimestamps"))
-	{
-		timeStr += ":[" + LLTrans::getString("TimeSec") + "]";
-	}
+	std::string timeStr = "[" + LLTrans::getString("TimeHour") + "]:[" + LLTrans::getString("TimeMin") + "]:[" + LLTrans::getString("TimeSec") + "]";
 	
 	LLSD substitution;
 	substitution["datetime"] = (S32)utc_time;
diff --git a/indra/newview/skins/default/xui/de/floater_fs_money_tracker.xml b/indra/newview/skins/default/xui/de/floater_fs_money_tracker.xml
index 195cab8f46..c7c21118d5 100644
--- a/indra/newview/skins/default/xui/de/floater_fs_money_tracker.xml
+++ b/indra/newview/skins/default/xui/de/floater_fs_money_tracker.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <floater name="money_tracker" title="Money-Tracker">
 	<name_list name="payment_list">
-		<name_list.columns name="time" label="Uhrzeit"/>
+		<name_list.columns name="time" label="Zeit"/>
 		<name_list.columns name="name" label="Name"/>
 		<name_list.columns name="amount" label="Betrag"/>
 	</name_list>
diff --git a/indra/newview/skins/default/xui/en/floater_fs_money_tracker.xml b/indra/newview/skins/default/xui/en/floater_fs_money_tracker.xml
index 2a4a3a9e41..11dbee52e0 100644
--- a/indra/newview/skins/default/xui/en/floater_fs_money_tracker.xml
+++ b/indra/newview/skins/default/xui/en/floater_fs_money_tracker.xml
@@ -25,7 +25,7 @@
 	 name="payment_list"
 	 draw_stripes="true"
 	 multi_select="true"
-	 name_column="name"
+	 name_column_index="1"
 	 right="-1">
 		<name_list.columns
 		 name="time"