summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/skins/default')
-rw-r--r--indra/newview/skins/default/xui/en/floater_im_session.xml2
-rw-r--r--indra/newview/skins/default/xui/en/panel_im_control_panel.xml2
-rw-r--r--indra/newview/skins/default/xui/en/panel_notes.xml11
-rw-r--r--indra/newview/skins/default/xui/en/strings.xml4
4 files changed, 15 insertions, 4 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index 70af2f63b6..452d28d4ea 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -15,7 +15,7 @@
width="520"
can_resize="true"
min_width="350"
- min_height="350">
+ min_height="369">
<layout_stack follows="left|top|right|bottom"
height="354"
width="520"
diff --git a/indra/newview/skins/default/xui/en/panel_im_control_panel.xml b/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
index c8b134cdf0..e81532ec3e 100644
--- a/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
+++ b/indra/newview/skins/default/xui/en/panel_im_control_panel.xml
@@ -14,7 +14,7 @@
width="125"/>
<text
- follows="left|right"
+ follows="top|left|right"
font="SansSerifBig"
height="16"
layout="topleft"
diff --git a/indra/newview/skins/default/xui/en/panel_notes.xml b/indra/newview/skins/default/xui/en/panel_notes.xml
index 5333dfa2f5..b9c9100ebc 100644
--- a/indra/newview/skins/default/xui/en/panel_notes.xml
+++ b/indra/newview/skins/default/xui/en/panel_notes.xml
@@ -17,13 +17,16 @@
left="0"
top="0"
height="517"
+ width="313"
border_size="0">
<panel
name="notes_stack"
follows="all"
layout="topleft"
top="0"
- left="0">
+ left="0"
+ height="475"
+ width="313">
<scroll_container
color="DkGray2"
follows="all"
@@ -31,8 +34,11 @@
left="0"
name="profile_scroll"
opaque="true"
+ height="475"
+ width="313"
top="0">
<panel
+ height="450"
layout="topleft"
name="profile_scroll_panel"
top="0"
@@ -104,7 +110,8 @@
layout="topleft"
left="0"
name="notes_buttons_panel"
- auto_resize="false">
+ auto_resize="false"
+ width="313">
<button
follows="bottom|left"
height="19"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index ec2673644f..c850dce141 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2845,6 +2845,10 @@ If you continue to receive this message, contact the [SUPPORT_SITE].
<string name="Unnamed">(Unnamed)</string>
<string name="IM_moderated_chat_label">(Moderated: Voices off by default)</string>
<string name="IM_unavailable_text_label">Text chat is not available for this call.</string>
+ <string name="IM_muted_text_label">Your text chat has been disabled by a Group Moderator.</string>
+ <string name="IM_default_text_label">Click here to instant message.</string>
+ <string name="IM_to_label">To</string>
+ <string name="IM_moderator_label">(Moderator)</string>
<string name="ringing-im">