diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-01-08 16:33:43 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-01-08 16:33:43 -0500 |
| commit | d9b83077867f6171743c934caf868d8e961152c4 (patch) | |
| tree | 0dca320e442f8844fbdb522666453a0673f9e822 /indra/newview/app_settings | |
| parent | a2d4b740ed1e633b1e479157b74fe3181beeaa2b (diff) | |
| parent | 0a3781673f7e95110d33df0332a4abe238f4c769 (diff) | |
automated merge viewer2.0->viewer2.0
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index d83959b80e..7d98a4b6ce 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -9342,18 +9342,7 @@ <string>S32</string> <key>Value</key> <integer>2</integer> - </map> - <key>UILineEditorVPad</key> - <map> - <key>Comment</key> - <string>UI Line Editor Vertical Pad</string> - <key>Persist</key> - <integer>1</integer> - <key>Type</key> - <string>S32</string> - <key>Value</key> - <integer>5</integer> - </map> + </map> <key>UIMaxComboWidth</key> <map> <key>Comment</key> |