summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorJustin C. Rounds (Chuck) <chuck@lindenlab.com>2009-12-07 16:35:37 -0500
committerJustin C. Rounds (Chuck) <chuck@lindenlab.com>2009-12-07 16:35:37 -0500
commitf22d9cfdae437ddd21491fc7d6a59668203bd172 (patch)
treee9199dc17952be65e4c6a153f421b4bd0c80455b /indra/newview
parent73abaaddd68186dee0c59d37375407a89f77183c (diff)
parent15fabd6b602c3ea0e8f09e6338e3a4f580c1acd4 (diff)
Automated merge with ssh://chuck@hg.lindenlab.com/james/gooey/
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/app_settings/settings.xml6
-rw-r--r--indra/newview/skins/default/xui/en/panel_toast.xml2
2 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index b301d784f9..61168630c0 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -1044,7 +1044,7 @@
<key>Type</key>
<string>S32</string>
<key>Value</key>
- <integer>10</integer>
+ <integer>4</integer>
</map>
<key>ButtonHeight</key>
<map>
@@ -1055,7 +1055,7 @@
<key>Type</key>
<string>S32</string>
<key>Value</key>
- <integer>20</integer>
+ <integer>23</integer>
</map>
<key>ButtonHeightSmall</key>
<map>
@@ -1066,7 +1066,7 @@
<key>Type</key>
<string>S32</string>
<key>Value</key>
- <integer>16</integer>
+ <integer>23</integer>
</map>
<key>ButtonVPad</key>
<map>
diff --git a/indra/newview/skins/default/xui/en/panel_toast.xml b/indra/newview/skins/default/xui/en/panel_toast.xml
index 6479fc91ca..707b24c92c 100644
--- a/indra/newview/skins/default/xui/en/panel_toast.xml
+++ b/indra/newview/skins/default/xui/en/panel_toast.xml
@@ -46,7 +46,7 @@
</text>
<button
layout="topleft"
- top="-6"
+ top="-14"
left="293"
width="17"
height="17"