Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'animesh' of https://github.com/Lirusaito/SingularityViewer into animesh

Browse Source
This commit is contained in:
Damian Zhaoying
2019-03-31 15:16:45 -03:00
parent 9b29fd1385 30f26f462b
commit ee745a20ef
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/app_settings/settings.xml
View File

@@ -7045,7 +7045,7 @@ This should be as low as possible, but too low may break functionality</string>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>%Y-%m-%d</string>
<string>%F</string>
</map>
<key>ShortTimeFormat</key>
<map>
@@ -7056,7 +7056,7 @@ This should be as low as possible, but too low may break functionality</string>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>%H:%M</string>
<string>%R</string>
</map>
<key>LongTimeFormat</key>
<map>
@@ -7067,7 +7067,7 @@ This should be as low as possible, but too low may break functionality</string>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>%H:%M:%S</string>
<string>%T</string>
</map>
<key>TimestampFormat</key>
<map>
@@ -7078,7 +7078,7 @@ This should be as low as possible, but too low may break functionality</string>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>%a %d %b %Y %H:%M:%S</string>
<string>%a %d %b %Y %T</string>
</map>
<key>SecondsInChatAndIMs</key>
<map>

14
indra/newview/ascentprefschat.cpp
View File

@@ -128,9 +128,9 @@ void LLPrefsAscentChat::onCommitTimeDate(LLUICtrl* ctrl)
if (tempTimeFormat == 0)
{
short_time = "%H:%M";
long_time = "%H:%M:%S";
timestamp = " %H:%M:%S";
short_time = "%R";
long_time = "%T";
timestamp = " %T";
}
else
{
@@ -141,7 +141,7 @@ void LLPrefsAscentChat::onCommitTimeDate(LLUICtrl* ctrl)
if (tempDateFormat == 0)
{
short_date = "%Y-%m-%d";
short_date = "%F";
long_date = "%A %d %B %Y";
timestamp = "%a %d %b %Y" + timestamp;
}
@@ -153,7 +153,7 @@ void LLPrefsAscentChat::onCommitTimeDate(LLUICtrl* ctrl)
}
else
{
short_date = "%m/%d/%Y";
short_date = "%D";
long_date = "%A, %B %d %Y";
timestamp = "%a %b %d %Y" + timestamp;
}
@@ -218,11 +218,11 @@ void LLPrefsAscentChat::refreshValues()
}
format = gSavedSettings.getString("ShortDateFormat");
if (format.find("%m/%d/%") != std::string::npos)
if (format.find("%D") != std::string::npos || format.find("%m/%d/%") != std::string::npos)
{
mDateFormat = 2;
}
else if (format.find("%d/%m/%") != -1)
else if (format.find("%d/%m/%") != std::string::npos)
{
mDateFormat = 1;
}

2
indra/newview/skins/default/xui/en-us/panel_status_bar.xml
View File

@@ -38,7 +38,7 @@
bottom="-20" disabled_color="TimeTextColor" drop_shadow_visible="true"
enabled="true" follows="right|bottom" font="SansSerifSmall" h_pad="0"
halign="right" height="18" left="-430" mouse_opaque="true" name="TimeText"
text_color="TimeTextColor" tool_tip="Current Time (Pacific)" v_pad="2" width="80">
text_color="TimeTextColor" tool_tip="Current Time (Pacific)" v_pad="2" width="120">
12:00 AM
</text>
<string name="StatBarDaysOfWeek">