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

Merge.

meow-7.2.2
Nicky 2018-04-28 15:36:08 +02:00
parent 2e7216016e 4bc58e41c2
commit 1af01b0bbd
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/fschathistory.cpp
View File

@ -1513,7 +1513,7 @@ void FSChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LL
std::string widget_associated_text = "\n";
if (needs_header_text)
{
widget_associated_text = "[" + chat.mTimeStr + "] ";
widget_associated_text += "[" + chat.mTimeStr + "] ";
if (utf8str_trim(chat.mFromName).size() != 0 && chat.mFromName != SYSTEM_FROM)
{
widget_associated_text += chat.mFromName + delimiter;

2
indra/newview/skins/default/xui/en/floater_preview_notecard.xml
View File

@ -33,7 +33,7 @@
left="322"
mouse_opaque="true"
name="lock"
top="4"
top="1"
width="18" />
<text
type="string"

2
indra/newview/skins/default/xui/en/floater_script_preview.xml
View File

@ -31,7 +31,7 @@
left="426"
mouse_opaque="true"
name="lock"
top="4"
top="1"
width="18" />
<text
type="string"