summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
authorEli Linden <eli@lindenlab.com>2010-02-24 18:46:52 -0800
committerEli Linden <eli@lindenlab.com>2010-02-24 18:46:52 -0800
commitf71098a4065896bd69fcfe55c83dd3a562a7ac64 (patch)
treec40d665ec2082164bcaa819a01a786e0f15d31da /indra/newview/skins/default
parentcea0bac85cf360f7e2818796585dc9ec49359adc (diff)
parentfadbd33b52b6deb465a49a4c0857ed8078277b15 (diff)
Merge
Diffstat (limited to 'indra/newview/skins/default')
-rw-r--r--indra/newview/skins/default/xui/en/floater_tools.xml21
-rw-r--r--indra/newview/skins/default/xui/en/notifications.xml3
2 files changed, 13 insertions, 11 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index d989282b9f..4e59a9b1ca 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -2,7 +2,7 @@
<floater
legacy_header_height="18"
follows="left|top|right"
- height="570"
+ height="580"
layout="topleft"
bg_opaque_image="Window_NoTitle_Foreground"
bg_alpha_image="Window_NoTitle_Background"
@@ -737,7 +737,7 @@
</text>
<tab_container
follows="left|top"
- height="400"
+ height="410"
halign="center"
left="0"
name="Object Info Tabs"
@@ -1054,7 +1054,7 @@ even though the user gets a free copy.
name="perms_build"
left="0"
top="241"
- height="120"
+ height="130"
width="278">
<text
type="string"
@@ -1135,7 +1135,7 @@ even though the user gets a free copy.
left="10"
name="B:"
height="10"
- width="45">
+ width="80">
B:
</text>
<text
@@ -1147,7 +1147,7 @@ even though the user gets a free copy.
left_pad="0"
name="O:"
height="10"
- width="44">
+ width="80">
O:
</text>
<text
@@ -1159,7 +1159,7 @@ even though the user gets a free copy.
left_pad="0"
name="G:"
height="10"
- width="43">
+ width="80">
G:
</text>
<text
@@ -1167,11 +1167,12 @@ even though the user gets a free copy.
text_color="White"
length="1"
follows="left|top"
- left_pad="0"
+ left="10"
+ top_pad="2"
layout="topleft"
name="E:"
height="10"
- width="43">
+ width="80">
E:
</text>
<text
@@ -1183,7 +1184,7 @@ even though the user gets a free copy.
left_pad="0"
name="N:"
height="10"
- width="48">
+ width="80">
N:
</text>
<text
@@ -1195,7 +1196,7 @@ even though the user gets a free copy.
left_pad="0"
name="F:"
height="10"
- width="50">
+ width="80">
F:
</text>
</panel>
diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml
index 8f1812830f..9d2c7b8bcc 100644
--- a/indra/newview/skins/default/xui/en/notifications.xml
+++ b/indra/newview/skins/default/xui/en/notifications.xml
@@ -5850,7 +5850,8 @@ Are you sure you want to close all IMs?
<usetemplate
name="okcancelignore"
notext="Cancel"
- yestext="OK"/>
+ yestext="OK"
+ ignoretext="Confirm before I close all IMs"/>
</notification>
<notification icon="notifytip.tga"