summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorYuri Chebotarev <ychebotarev@productengine.com>2009-11-17 13:52:16 +0200
committerYuri Chebotarev <ychebotarev@productengine.com>2009-11-17 13:52:16 +0200
commit1804fce466ff242e63f995bc47178e1514c5a59d (patch)
tree21599c586762384e838ab9af68a540456ef5f6e3 /indra
parente1aaaa34e45daca5a39a040865938cb3e2404f3e (diff)
fix4 normal task EXT-2521 Remove timestamp and fake voice indicator from nearby chat toasts
--HG-- branch : product-engine
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llchatitemscontainerctrl.cpp3
-rw-r--r--indra/newview/skins/default/xui/en/panel_chat_item.xml10
2 files changed, 2 insertions, 11 deletions
diff --git a/indra/newview/llchatitemscontainerctrl.cpp b/indra/newview/llchatitemscontainerctrl.cpp
index d2e3247250..244c7b1794 100644
--- a/indra/newview/llchatitemscontainerctrl.cpp
+++ b/indra/newview/llchatitemscontainerctrl.cpp
@@ -171,9 +171,6 @@ void LLNearbyChatToastPanel::init(LLSD& notification)
caption->getChild<LLTextBox>("sender_name", false)->setText(str_sender , style_params);
- caption->getChild<LLTextBox>("msg_time", false)->setText(appendTime() , style_params );
-
-
LLChatMsgBox* msg_text = getChild<LLChatMsgBox>("msg_text", false);
msg_text->setText(mText, style_params);
diff --git a/indra/newview/skins/default/xui/en/panel_chat_item.xml b/indra/newview/skins/default/xui/en/panel_chat_item.xml
index 05b04bbf8e..d8a0c877fd 100644
--- a/indra/newview/skins/default/xui/en/panel_chat_item.xml
+++ b/indra/newview/skins/default/xui/en/panel_chat_item.xml
@@ -15,19 +15,13 @@
color="1 1 1 1" enabled="true" name="avatar_icon"
/>
<text
- width="130" top="25" left="40" height="20" follows="left|right|top"
+ width="150" top="25" left="40" height="20" follows="left|right|top"
font="SansSerifBigBold" text_color="white" word_wrap="false" use_ellipses="true"
mouse_opaque="true" name="sender_name" >
Jerry Knight
</text>
- <icon top="22" left="170" width="15" height="15" follows="top|right"
+ <icon top="22" left="215" width="15" height="15" follows="top|right"
image_name="icn_voice-pvtfocus.tga" visible="false" name="msg_inspector"/>
- <icon top="22" left="190" width="10" height="10" follows="top|right"
- image_name="speaking_indicator.tga" name="msg_icon"/>
- <text width="35" top="22" left="205" height="20" follows="right|top"
- text_color="white" word_wrap="true" mouse_opaque="true" name="msg_time" >
- 10:32
- </text>
</panel>
<text_chat
top="-35" left="10" right="-10" height="120" follows="left|right|bottom"