summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-02-08 14:58:53 -0500
committerLoren Shih <seraph@lindenlab.com>2010-02-08 14:58:53 -0500
commit399d70eede54dff2ba6d14b33f85fdad4d33a662 (patch)
treece922e0963b8d46c236c4320b574916507fa3b65 /indra/newview/app_settings
parent7e1932878563e5847335d5dcb66c9b23232c372c (diff)
parent19f4240f977fc26d97e686c4e3a1f13b063e191c (diff)
automated merge viewer2.0->viewer2.0
Diffstat (limited to 'indra/newview/app_settings')
-rw-r--r--indra/newview/app_settings/settings.xml22
1 files changed, 0 insertions, 22 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 923ba44906..a32f0d046e 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -9938,28 +9938,6 @@
<key>Value</key>
<integer>15</integer>
</map>
- <key>UIButtonImageLeftPadding</key>
- <map>
- <key>Comment</key>
- <string>Button Overlay Image Left Padding</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>S32</string>
- <key>Value</key>
- <integer>4</integer>
- </map>
- <key>UIButtonImageRightPadding</key>
- <map>
- <key>Comment</key>
- <string>Button Overlay Image Right Padding</string>
- <key>Persist</key>
- <integer>1</integer>
- <key>Type</key>
- <string>S32</string>
- <key>Value</key>
- <integer>4</integer>
- </map>
<key>UIButtonImageTopPadding</key>
<map>
<key>Comment</key>