livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Backing out timestamp patch, needs to be reworked as a Hide option to protect compatibility with IM.

meow-7.2.2
Arrehn 2011-08-11 23:05:38 -04:00
parent 7930251bb7
commit 03e3fd46a9
4 changed files with 6 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -594,17 +594,6 @@
<key>Value</key>
<integer>0</integer>
</map>
<key>FSTimestampsInNearbyChat</key>
<map>
<key>Comment</key>
<string>Show timestamps in nearby chat</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>FSSecondsinChatTimestamps</key>
<map>
<key>Comment</key>

10
indra/newview/llchathistory.cpp
View File

@ -779,7 +779,6 @@ void LLChatHistory::lookupDisplayNames(const LLChat& chat)
void LLChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LLStyle::Params& input_append_params)
{
bool use_plain_text_chat_history = args["use_plain_text_chat_history"].asBoolean();
bool show_timestamps_in_nearby_chat = args["show_timestamps_in_nearby_chat"].asBoolean();
// AO: Do any display name lookups in plaintext chat headers as early as possible to give the cache maximal
//time to get an answer back before it's needed.
if (use_plain_text_chat_history)
@ -902,14 +901,7 @@ void LLChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LL
timestamp_style.color(timestamp_color);
timestamp_style.readonly_color(timestamp_color);
}
if (show_timestamps_in_nearby_chat)
{
mEditor->appendText("[" + chat.mTimeStr + "] ", mEditor->getText().size() != 0, timestamp_style);
}
else
{
mEditor->appendLineBreakSegment(timestamp_style);
}
mEditor->appendText("[" + chat.mTimeStr + "] ", mEditor->getText().size() != 0, timestamp_style);
if (utf8str_trim(chat.mFromName).size() != 0)
{

15
indra/newview/llnearbychat.cpp
View File

@ -222,11 +222,10 @@ std::string appendTime()
utc_time = time_corrected();
std::string timeStr ="["+ LLTrans::getString("TimeHour")+"]:["
+LLTrans::getString("TimeMin")+"]";
if (gSavedSettings.getBOOL("FSSecondsinChatTimestamps"))
{
timeStr += ":["
+LLTrans::getString("TimeSec")+"]";
timeStr += ":["
+LLTrans::getString("TimeSec")+"]";
}
LLSD substitution;
@ -242,20 +241,16 @@ void LLNearbyChat::addMessage(const LLChat& chat,bool archive,const LLSD &args)
{
LLChat& tmp_chat = const_cast<LLChat&>(chat);
bool use_plain_text_chat_history = gSavedSettings.getBOOL("PlainTextChatHistory");
bool show_timestamps_in_nearby_chat = gSavedSettings.getBOOL("FSTimestampsInNearbyChat");
if (show_timestamps_in_nearby_chat)
{
if(tmp_chat.mTimeStr.empty())
tmp_chat.mTimeStr = appendTime();
}
if(tmp_chat.mTimeStr.empty())
tmp_chat.mTimeStr = appendTime();
if (!chat.mMuted)
{
tmp_chat.mFromName = chat.mFromName;
LLSD chat_args = args;
chat_args["use_plain_text_chat_history"] = use_plain_text_chat_history;
chat_args["show_timestamps_in_nearby_chat"] = show_timestamps_in_nearby_chat;
mChatHistory->appendMessage(chat, chat_args);
}

9
indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
View File

@ -167,15 +167,6 @@
left_delta="0"
name="seconds_in_timestamps"
top_pad="4"
width="237" />
<check_box
control_name="FSTimestampsInNearbyChat"
height="16"
label="Show timestamp in Nearby Chat"
layout="topleft"
left_delta="0"
name="timestamps_in_nearby_chat"
top_pad="4"
width="237" />
<check_box
control_name="LogFileNamewithDate"